diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.nib/designable.nib
index 3976790..763aeeb 100644
--- a/English.lproj/MainMenu.nib/designable.nib
+++ b/English.lproj/MainMenu.nib/designable.nib
@@ -8,10 +8,10 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="510"/>
+			<integer value="405"/>
 			<integer value="437"/>
-			<integer value="406"/>
 			<integer value="424"/>
-			<integer value="510"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -40,7 +40,7 @@
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{196, 216}, {285, 294}}</string>
 				<int key="NSWTFlags">1677722624</int>
-				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowTitle">Run Task</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -227,9 +227,7 @@
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{363, 594}, {332, 396}}</string>
 				<int key="NSWTFlags">1886912512</int>
-				<object class="NSMutableString" key="NSWindowTitle">
-					<characters key="NS.bytes">Window</characters>
-				</object>
+				<string key="NSWindowTitle">Preferences</string>
 				<object class="NSMutableString" key="NSWindowClass">
 					<characters key="NS.bytes">NSWindow</characters>
 				</object>
@@ -767,38 +765,6 @@
 					</object>
 					<int key="connectionID">481</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">hostField</string>
-						<reference key="source" ref="692680910"/>
-						<reference key="destination" ref="683084375"/>
-					</object>
-					<int key="connectionID">482</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">newHostSheet</string>
-						<reference key="source" ref="692680910"/>
-						<reference key="destination" ref="428999088"/>
-					</object>
-					<int key="connectionID">483</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">passwordField</string>
-						<reference key="source" ref="692680910"/>
-						<reference key="destination" ref="426858088"/>
-					</object>
-					<int key="connectionID">484</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">preferencesWindow</string>
-						<reference key="source" ref="692680910"/>
-						<reference key="destination" ref="310173232"/>
-					</object>
-					<int key="connectionID">485</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">spinner</string>
@@ -807,22 +773,6 @@
 					</object>
 					<int key="connectionID">486</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableView</string>
-						<reference key="source" ref="692680910"/>
-						<reference key="destination" ref="667347660"/>
-					</object>
-					<int key="connectionID">487</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">usernameField</string>
-						<reference key="source" ref="692680910"/>
-						<reference key="destination" ref="596052573"/>
-					</object>
-					<int key="connectionID">488</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">add:</string>
@@ -927,6 +877,54 @@
 					</object>
 					<int key="connectionID">525</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">preferences_window</string>
+						<reference key="source" ref="692680910"/>
+						<reference key="destination" ref="310173232"/>
+					</object>
+					<int key="connectionID">526</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">table_view</string>
+						<reference key="source" ref="692680910"/>
+						<reference key="destination" ref="667347660"/>
+					</object>
+					<int key="connectionID">527</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">new_host_sheet</string>
+						<reference key="source" ref="692680910"/>
+						<reference key="destination" ref="428999088"/>
+					</object>
+					<int key="connectionID">528</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">host_field</string>
+						<reference key="source" ref="692680910"/>
+						<reference key="destination" ref="683084375"/>
+					</object>
+					<int key="connectionID">529</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">password_field</string>
+						<reference key="source" ref="692680910"/>
+						<reference key="destination" ref="426858088"/>
+					</object>
+					<int key="connectionID">530</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">username_field</string>
+						<reference key="source" ref="692680910"/>
+						<reference key="destination" ref="596052573"/>
+					</object>
+					<int key="connectionID">531</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1533,9 +1531,9 @@
 					<reference ref="5"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="5"/>
-					<string>{{557, 344}, {371, 206}}</string>
+					<string>{{647, 562}, {371, 206}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{557, 344}, {371, 206}}</string>
+					<string>{{647, 562}, {371, 206}}</string>
 					<reference ref="5"/>
 					<string>{{120, 647}, {371, 206}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1561,9 +1559,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="5"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{502, 604}, {571, 327}}</string>
+					<string>{{418, 604}, {571, 327}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{502, 604}, {571, 327}}</string>
+					<string>{{418, 604}, {571, 327}}</string>
 					<reference ref="6"/>
 					<reference ref="5"/>
 					<string>{571, 303}</string>
@@ -1599,7 +1597,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">525</int>
+			<int key="maxID">531</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1628,15 +1626,13 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addButton</string>
-							<string>cancelButton</string>
-							<string>hostField</string>
-							<string>newHostSheet</string>
-							<string>passwordField</string>
-							<string>preferencesWindow</string>
+							<string>host_field</string>
+							<string>new_host_sheet</string>
+							<string>password_field</string>
+							<string>preferences_window</string>
 							<string>spinner</string>
-							<string>tableView</string>
-							<string>usernameField</string>
+							<string>table_view</string>
+							<string>username_field</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1647,8 +1643,6 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 404511a..8770234 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/controller/preferences_controller.rb b/controller/preferences_controller.rb
index e5df3e6..22b5982 100644
--- a/controller/preferences_controller.rb
+++ b/controller/preferences_controller.rb
@@ -9,15 +9,13 @@ class PreferencesController < OSX::NSWindowController
   notify :host_version_not_accepted, :when => :host_version_inacceptable
   notify :host_credentials_invalid, :when => :host_credentials_invalid
   
-  ib_outlet :preferencesWindow
-  ib_outlet :tableView
-  ib_outlet :newHostSheet
-  ib_outlet :addButton
-  ib_outlet :cancelButton
+  ib_outlet :preferences_window
+  ib_outlet :table_view
+  ib_outlet :new_host_sheet
   ib_outlet :spinner
-  ib_outlet :hostField
-  ib_outlet :usernameField
-  ib_outlet :passwordField
+  ib_outlet :host_field
+  ib_outlet :username_field
+  ib_outlet :password_field
   
   def init
     init_hosts
@@ -53,53 +51,52 @@ def fetchPasswords
   def showPreferences
     NSApp.activateIgnoringOtherApps true
     self.showWindow(self)
-    @preferencesWindow.makeKeyAndOrderFront(self)
-    @preferencesWindow.setTitle("Preferences")
+    @preferences_window.makeKeyAndOrderFront(self)
   end
   
-  def numberOfRowsInTableView(tableView)
+  def numberOfRowsInTableView(table_view)
     @hosts.size
   end
   
-  def tableView_objectValueForTableColumn_row(tableView, column, row)
+  def tableView_objectValueForTableColumn_row(table_view, column, row)
     @hosts[row].url
   end
   
   ib_action :add do
-    NSApp.beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo(@newHostSheet, @preferencesWindow, nil, nil, nil)
-    NSApp.endSheet @newHostSheet
+    NSApp.beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo(@new_host_sheet, @preferences_window, nil, nil, nil)
+    NSApp.endSheet @new_host_sheet
   end
   
   ib_action :addFromSheet do
     @spinner.startAnimation(self)
     @spinner.setHidden(false)
     host = Host.new
-    host.url = @hostField.stringValue
-    host.username = @usernameField.stringValue
-    host.password = @passwordField.stringValue.to_s
+    host.url = @host_field.stringValue
+    host.username = @username_field.stringValue
+    host.password = @password_field.stringValue.to_s
     host.schedule_version_check
   end
 
   def host_version_accepted(notification)
     # ignore messages to instances not connected to the nib. weird side effect of having an instance
     # of the controller in the project_controller
-    return if @hostField.nil?
+    return if @host_field.nil?
     host = notification.object
     add_host host
-    @newHostSheet.orderOut self
-    @tableView.reloadData
+    @new_host_sheet.orderOut self
+    @table_view.reloadData
     host.find_projects
   end
   
   def host_version_not_accepted(notification)
-    return if @hostField.nil?
+    return if @host_field.nil?
     host = notification.object
     show_alert("The Webistrano version you're running is not suitable for use with Macistrano", "You need at least version #{Host::ACCEPT_VERSION.join(".")}.")
     reset_spinner
   end
 
   def host_credentials_invalid(notification)
-    return if @hostField.nil?
+    return if @host_field.nil?
     show_alert("The specified credentials are invalid.", "Please check username and password and try again.")
     reset_spinner
   end
@@ -126,18 +123,18 @@ def reset_spinner
   end
 
   ib_action :removeHost do
-    unless @tableView.selectedRow < 0
-      host = @hosts[@tableView.selectedRow]
+    unless @table_view.selectedRow < 0
+      host = @hosts[@table_view.selectedRow]
       Keychain.remove_password host
-      @hosts.delete_at(@tableView.selectedRow)
+      @hosts.delete_at(@table_view.selectedRow)
       save_hosts_to_preferences
       notify_host_removed host
-      @tableView.reloadData
+      @table_view.reloadData
     end
   end
   
   def closeSheet
-    @newHostSheet.orderOut self
+    @new_host_sheet.orderOut self
   end
   
   def add_host host
@@ -160,9 +157,9 @@ def hosts_as_list
   end
   
   def reset_fields
-    @hostField.setStringValue ""
-    @newHostSheet.makeFirstResponder @hostField
-    @passwordField.setStringValue ""
-    @usernameField.setStringValue ""
+    @host_field.setStringValue ""
+    @new_host_sheet.makeFirstResponder @host_field
+    @password_field.setStringValue ""
+    @username_field.setStringValue ""
   end
 end
diff --git a/controller/project_controller.rb b/controller/project_controller.rb
index 7d3a2af..4fc1027 100644
--- a/controller/project_controller.rb
+++ b/controller/project_controller.rb
@@ -155,7 +155,6 @@ def clicked(sender)
     @task_field.setStringValue(sender.representedObject.name)
     NSApp.activateIgnoringOtherApps(true)
     @run_task_dialog.makeFirstResponder(@description_field)
-    @run_task_dialog.setTitle("Run Task")
     @run_task_dialog.makeKeyAndOrderFront(self)
     @run_task_dialog.center
   end
diff --git a/model/host.rb b/model/host.rb
index 5a3f082..daff2bf 100644
--- a/model/host.rb
+++ b/model/host.rb
@@ -24,8 +24,13 @@ def init
     @projects = []
     self
   end
+
+  def url=(url)
+    url = "http://#{url}" unless url.index("http://") == 0 or url.index("https://") == 0
+    @url = url
+  end
   
-  def read_xml path
+  def read_xml(path)
     io = open("#{url}#{path}", :http_basic_authentication => [username, password])
     io.read
   end
diff --git a/spec/host_spec.rb b/spec/host_spec.rb
index 2a43457..b429985 100644
--- a/spec/host_spec.rb
+++ b/spec/host_spec.rb
@@ -153,8 +153,25 @@ def fetch_stages
   end
 end
 
-describe Host, "when checking for the host version" do
+describe Host, "when setting the url" do
+  before(:each) do
+    @host = Host.new
+  end
+  
+  it "should append http:// if url is not complete" do
+    @host.url = "webistrano.local"
+    @host.url.should == "http://webistrano.local"
+  end
   
+  it "should not append http:// if url has http:// set" do
+    @host.url = "http://webistrano.local"
+    @host.url.should == "http://webistrano.local"
+  end
+  
+  it "should not append http:// if url has https:// set" do
+    @host.url = "https://webistrano.local"
+    @host.url.should == "https://webistrano.local"
+  end
 end
 
 describe Host, "when notified that a project finished loading" do