Have blurb if click Report and name/email not yet set.

8 files changed, 762 insertions, 93 deletions

diff --git a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m
index 4491bb85e..ae6739e41 100644
--- a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m
+++ b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m
@@ -97,6 +97,19 @@
 // Report stuff
 -(void)uploadReport {
 	// Not yet working - do something spinny here
+	[UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
+//	struct CGRect rect = [UIHardware fullScreenApplicationContentRect];
+//	rect.origin.x = rect.origin.y = 0.0f;
+//	UIWindow *window = [[UIWindow alloc] initWithContentRect: rect];
+//	[window orderFront: self];
+//	[window makeKey: self];
+//	[window setContentView: imgView];
+//	
+//	id HUD = [[UIProgressHUD alloc] initWithWindow:window];
+//	[HUD setText:@"Downloading now..."];
+//	[HUD show:YES];
+
+	
 	// UIActivityIndicatorView *spinny = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
 	// [spinny startAnimating];
 	// [spinny release];
@@ -168,7 +181,10 @@
 	
 	NSData *returnData = [NSURLConnection sendSynchronousRequest:request returningResponse:nil error:nil];
 	NSString *returnString = [[NSString alloc] initWithData:returnData encoding:NSASCIIStringEncoding];
-    
+
+	[UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+//	[HUD show:NO];
+
 	// For now, just pop up alert box with return data
 	UIAlertView *v = [[UIAlertView alloc] initWithTitle:@"Return" message:returnString delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
 	[v show];
diff --git a/iphone/FixMyStreet/Classes/InputTableViewController.h b/iphone/FixMyStreet/Classes/InputTableViewController.h
index 3eeef327b..eb904d5a1 100644
--- a/iphone/FixMyStreet/Classes/InputTableViewController.h
+++ b/iphone/FixMyStreet/Classes/InputTableViewController.h
@@ -28,7 +28,7 @@
 -(void)uploadReport;
 
 -(IBAction)addPhoto:(id) sender;
--(IBAction)gotoSettings:(id)sender;
+-(IBAction)gotoSettings:(id)sender firstTime:(BOOL)firstTime;
 
 // UIImagePickerControllerDelegate
 - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingImage:(UIImage *)image editingInfo:(NSDictionary *)editingInfo;
diff --git a/iphone/FixMyStreet/Classes/InputTableViewController.m b/iphone/FixMyStreet/Classes/InputTableViewController.m
index 850257632..fcf11c879 100644
--- a/iphone/FixMyStreet/Classes/InputTableViewController.m
+++ b/iphone/FixMyStreet/Classes/InputTableViewController.m
@@ -267,10 +267,12 @@
 
 // Buttons
 
--(IBAction)gotoSettings:(id)sender {
+-(IBAction)gotoSettings:(id)sender firstTime:(BOOL)firstTime {
 	backButton.title = @"Done";
 		
-	UIViewController* settingsViewController = [[SettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+	SettingsViewController* settingsViewController = [[SettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+	if (firstTime)
+		settingsViewController.firstTime = firstTime; 
 	//	[self.navigationController pushViewController:settingsViewController animated:YES];
 	[UIView beginAnimations:nil context:NULL];
 	[UIView setAnimationDuration: 1];
@@ -283,7 +285,7 @@
 -(void)uploadReport {
 	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
 	if (!delegate.name || !delegate.email) {
-		[self gotoSettings:nil];
+		[self gotoSettings:nil firstTime:NO];
 	} else {
 		[delegate uploadReport];
 	}
diff --git a/iphone/FixMyStreet/Classes/SettingsViewController.h b/iphone/FixMyStreet/Classes/SettingsViewController.h
index 0e325132b..1030129f9 100644
--- a/iphone/FixMyStreet/Classes/SettingsViewController.h
+++ b/iphone/FixMyStreet/Classes/SettingsViewController.h
@@ -15,6 +15,10 @@
 	UILabel *emailCurrent;
 	UILabel *phoneLabel;
 	UILabel *phoneCurrent;
+	
+	BOOL firstTime;
 }
 
+@property (nonatomic, assign) BOOL firstTime;
+
 @end
diff --git a/iphone/FixMyStreet/Classes/SettingsViewController.m b/iphone/FixMyStreet/Classes/SettingsViewController.m
index 4be1686ba..2e3b2dbed 100644
--- a/iphone/FixMyStreet/Classes/SettingsViewController.m
+++ b/iphone/FixMyStreet/Classes/SettingsViewController.m
@@ -12,6 +12,8 @@
 
 @implementation SettingsViewController
 
+@synthesize firstTime;
+
 /*
 - (id)initWithStyle:(UITableViewStyle)style {
     // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
@@ -36,7 +38,9 @@
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return 3;
+	if (self.firstTime)
+		return 3;
+    return 4;
 }
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
@@ -47,9 +51,31 @@
     return 1;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+	if (indexPath.section == 3) {
+		return 54.0;
+	}
+	return 44.0;
+}
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    
+
+	if (indexPath.section == 3) {
+		static NSString *CellIdentifier = @"InfoCell";
+		UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+		if (cell == nil) {
+			cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease];
+			UITextView *blurb = [[UITextView alloc] initWithFrame:CGRectMake(10, 0, 280, 44)];
+			blurb.font = [UIFont italicSystemFontOfSize:14];
+			blurb.textAlignment = UITextAlignmentCenter;
+			blurb.editable = NO;
+			blurb.text = @"Please fill in your details, and\nwe'll remember them for next time";
+			[cell.contentView addSubview:blurb];
+			[blurb release];
+		}
+		return cell;
+	}
+
     static NSString *CellIdentifier = @"Cell";
 	FixMyStreetAppDelegate* delegate = [[UIApplication sharedApplication] delegate];
 
@@ -130,8 +156,12 @@
 
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
 	[tableView deselectRowAtIndexPath:indexPath animated:YES];
+	if (indexPath.section == 3) {
+		return;
+	}
+
+	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
 	EditSubjectViewController* editSubjectViewController = [[EditSubjectViewController alloc] initWithStyle:UITableViewStyleGrouped];
 	if (indexPath.section == 0) {
 		[editSubjectViewController setAll:delegate.name viewTitle:@"Edit name" placeholder:@"Your name" keyboardType:UIKeyboardTypeDefault capitalisation:UITextAutocapitalizationTypeWords];
diff --git a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.mode1v3 b/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.mode1v3
index 3ae567645..82cde513d 100644
--- a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.mode1v3
+++ b/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.mode1v3
@@ -274,7 +274,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>11</integer>
+									<integer>7</integer>
 									<integer>3</integer>
 									<integer>0</integer>
 								</array>
@@ -319,7 +319,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>FixMyStreetAppDelegate.m</string>
+								<string>SettingsViewController.m</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -327,11 +327,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>FixMyStreetAppDelegate.m</string>
+										<string>SettingsViewController.m</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>34C179AF0EB0A6DD00768D1C</string>
+										<string>34C17A0C0EB0B1A700768D1C</string>
 										<key>history</key>
 										<array>
 											<string>345578F90EAE370F008C5D7F</string>
@@ -340,17 +340,17 @@
 											<string>3455799D0EAEA273008C5D7F</string>
 											<string>3455799E0EAEA273008C5D7F</string>
 											<string>3455799F0EAEA273008C5D7F</string>
-											<string>34C1793B0EB0A07500768D1C</string>
-											<string>34C1793C0EB0A07500768D1C</string>
 											<string>34C1793D0EB0A07500768D1C</string>
 											<string>34C1793E0EB0A07500768D1C</string>
 											<string>34C179400EB0A07500768D1C</string>
-											<string>34C179410EB0A07500768D1C</string>
 											<string>34C179430EB0A07500768D1C</string>
-											<string>34C179A70EB0A6DD00768D1C</string>
 											<string>34C179A80EB0A6DD00768D1C</string>
 											<string>34C179A90EB0A6DD00768D1C</string>
-											<string>34C179AA0EB0A6DD00768D1C</string>
+											<string>34C179CF0EB0AD4A00768D1C</string>
+											<string>34C17A030EB0B1A700768D1C</string>
+											<string>34C17A040EB0B1A700768D1C</string>
+											<string>34C17A050EB0B1A700768D1C</string>
+											<string>34C17A060EB0B1A700768D1C</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -427,6 +427,21 @@
 											<string>34C179AC0EB0A6DD00768D1C</string>
 											<string>34C179AD0EB0A6DD00768D1C</string>
 											<string>34C179AE0EB0A6DD00768D1C</string>
+											<string>34C179C00EB0AC9800768D1C</string>
+											<string>34C179C10EB0AC9800768D1C</string>
+											<string>34C179C20EB0AC9800768D1C</string>
+											<string>34C179C30EB0AC9800768D1C</string>
+											<string>34C179C90EB0AD1600768D1C</string>
+											<string>34C179CA0EB0AD1600768D1C</string>
+											<string>34C179CB0EB0AD1600768D1C</string>
+											<string>34C179D10EB0AD4A00768D1C</string>
+											<string>34C179D20EB0AD4A00768D1C</string>
+											<string>34C179DE0EB0ADE000768D1C</string>
+											<string>34C17A070EB0B1A700768D1C</string>
+											<string>34C17A080EB0B1A700768D1C</string>
+											<string>34C17A090EB0B1A700768D1C</string>
+											<string>34C17A0A0EB0B1A700768D1C</string>
+											<string>34C17A0B0EB0B1A700768D1C</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
diff --git a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.pbxuser b/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.pbxuser
index 0aca5f5d0..50cd2641d 100644
--- a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.pbxuser
+++ b/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.pbxuser
@@ -10,10 +10,9 @@
 	};
 	1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{4322, 5266}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 9596}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 1414}}";
-			sepNavSelRange = "{2210, 0}";
-			sepNavVisRange = "{89, 2737}";
+			sepNavIntBoundsRect = "{{0, 0}, {1229, 3052}}";
+			sepNavSelRange = "{235, 0}";
+			sepNavVisRange = "{2557, 2124}";
 			sepNavWindowFrame = "{{130, 510}, {750, 558}}";
 		};
 	};
@@ -451,6 +450,61 @@
 			34C179AD0EB0A6DD00768D1C /* PBXTextBookmark */ = 34C179AD0EB0A6DD00768D1C /* PBXTextBookmark */;
 			34C179AE0EB0A6DD00768D1C /* PBXTextBookmark */ = 34C179AE0EB0A6DD00768D1C /* PBXTextBookmark */;
 			34C179AF0EB0A6DD00768D1C /* PBXTextBookmark */ = 34C179AF0EB0A6DD00768D1C /* PBXTextBookmark */;
+			34C179B40EB0A9B100768D1C /* PBXTextBookmark */ = 34C179B40EB0A9B100768D1C /* PBXTextBookmark */;
+			34C179B50EB0A9B100768D1C /* PBXTextBookmark */ = 34C179B50EB0A9B100768D1C /* PBXTextBookmark */;
+			34C179B70EB0A9BA00768D1C /* PBXTextBookmark */ = 34C179B70EB0A9BA00768D1C /* PBXTextBookmark */;
+			34C179BA0EB0A9F700768D1C /* PBXTextBookmark */ = 34C179BA0EB0A9F700768D1C /* PBXTextBookmark */;
+			34C179BD0EB0AC9800768D1C /* PBXTextBookmark */ = 34C179BD0EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179BE0EB0AC9800768D1C /* PBXTextBookmark */ = 34C179BE0EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179BF0EB0AC9800768D1C /* PBXTextBookmark */ = 34C179BF0EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179C00EB0AC9800768D1C /* PBXTextBookmark */ = 34C179C00EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179C10EB0AC9800768D1C /* PBXTextBookmark */ = 34C179C10EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179C20EB0AC9800768D1C /* PBXTextBookmark */ = 34C179C20EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179C30EB0AC9800768D1C /* PBXTextBookmark */ = 34C179C30EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179C40EB0AC9800768D1C /* PBXTextBookmark */ = 34C179C40EB0AC9800768D1C /* PBXTextBookmark */;
+			34C179C60EB0AD1600768D1C /* PBXTextBookmark */ = 34C179C60EB0AD1600768D1C /* PBXTextBookmark */;
+			34C179C70EB0AD1600768D1C /* PBXTextBookmark */ = 34C179C70EB0AD1600768D1C /* PBXTextBookmark */;
+			34C179C80EB0AD1600768D1C /* PBXTextBookmark */ = 34C179C80EB0AD1600768D1C /* PBXTextBookmark */;
+			34C179C90EB0AD1600768D1C /* PBXTextBookmark */ = 34C179C90EB0AD1600768D1C /* PBXTextBookmark */;
+			34C179CA0EB0AD1600768D1C /* PBXTextBookmark */ = 34C179CA0EB0AD1600768D1C /* PBXTextBookmark */;
+			34C179CB0EB0AD1600768D1C /* PBXTextBookmark */ = 34C179CB0EB0AD1600768D1C /* PBXTextBookmark */;
+			34C179CC0EB0AD1600768D1C /* PBXTextBookmark */ = 34C179CC0EB0AD1600768D1C /* PBXTextBookmark */;
+			34C179CF0EB0AD4A00768D1C /* PBXTextBookmark */ = 34C179CF0EB0AD4A00768D1C /* PBXTextBookmark */;
+			34C179D00EB0AD4A00768D1C /* PBXTextBookmark */ = 34C179D00EB0AD4A00768D1C /* PBXTextBookmark */;
+			34C179D10EB0AD4A00768D1C /* PBXTextBookmark */ = 34C179D10EB0AD4A00768D1C /* PBXTextBookmark */;
+			34C179D20EB0AD4A00768D1C /* PBXTextBookmark */ = 34C179D20EB0AD4A00768D1C /* PBXTextBookmark */;
+			34C179D30EB0AD4A00768D1C /* PBXTextBookmark */ = 34C179D30EB0AD4A00768D1C /* PBXTextBookmark */;
+			34C179D50EB0AD5C00768D1C /* PBXTextBookmark */ = 34C179D50EB0AD5C00768D1C /* PBXTextBookmark */;
+			34C179D70EB0AD5F00768D1C /* PBXTextBookmark */ = 34C179D70EB0AD5F00768D1C /* PBXTextBookmark */;
+			34C179DA0EB0AD8B00768D1C /* PBXTextBookmark */ = 34C179DA0EB0AD8B00768D1C /* PBXTextBookmark */;
+			34C179DC0EB0ADE000768D1C /* PBXTextBookmark */ = 34C179DC0EB0ADE000768D1C /* PBXTextBookmark */;
+			34C179DD0EB0ADE000768D1C /* PBXTextBookmark */ = 34C179DD0EB0ADE000768D1C /* PBXTextBookmark */;
+			34C179DE0EB0ADE000768D1C /* PBXTextBookmark */ = 34C179DE0EB0ADE000768D1C /* PBXTextBookmark */;
+			34C179DF0EB0ADE000768D1C /* PBXTextBookmark */ = 34C179DF0EB0ADE000768D1C /* PBXTextBookmark */;
+			34C179E10EB0AE1400768D1C /* PBXTextBookmark */ = 34C179E10EB0AE1400768D1C /* PBXTextBookmark */;
+			34C179E50EB0AE7E00768D1C /* PBXTextBookmark */ = 34C179E50EB0AE7E00768D1C /* PBXTextBookmark */;
+			34C179E70EB0AEE000768D1C /* PBXTextBookmark */ = 34C179E70EB0AEE000768D1C /* PBXTextBookmark */;
+			34C179E90EB0AEFF00768D1C /* PBXTextBookmark */ = 34C179E90EB0AEFF00768D1C /* PBXTextBookmark */;
+			34C179EB0EB0AF5400768D1C /* PBXTextBookmark */ = 34C179EB0EB0AF5400768D1C /* PBXTextBookmark */;
+			34C179ED0EB0AF6F00768D1C /* PBXTextBookmark */ = 34C179ED0EB0AF6F00768D1C /* PBXTextBookmark */;
+			34C179EF0EB0AFA100768D1C /* PBXTextBookmark */ = 34C179EF0EB0AFA100768D1C /* PBXTextBookmark */;
+			34C179F10EB0AFFB00768D1C /* PBXTextBookmark */ = 34C179F10EB0AFFB00768D1C /* PBXTextBookmark */;
+			34C179F30EB0B03500768D1C /* PBXTextBookmark */ = 34C179F30EB0B03500768D1C /* PBXTextBookmark */;
+			34C179F50EB0B04500768D1C /* PBXTextBookmark */ = 34C179F50EB0B04500768D1C /* PBXTextBookmark */;
+			34C179F70EB0B0B100768D1C /* PBXTextBookmark */ = 34C179F70EB0B0B100768D1C /* PBXTextBookmark */;
+			34C179F90EB0B0C900768D1C /* PBXTextBookmark */ = 34C179F90EB0B0C900768D1C /* PBXTextBookmark */;
+			34C179FB0EB0B0DB00768D1C /* PBXTextBookmark */ = 34C179FB0EB0B0DB00768D1C /* PBXTextBookmark */;
+			34C179FD0EB0B0F000768D1C /* PBXTextBookmark */ = 34C179FD0EB0B0F000768D1C /* PBXTextBookmark */;
+			34C17A030EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A030EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A040EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A040EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A050EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A050EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A060EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A060EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A070EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A070EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A080EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A080EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A090EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A090EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A0A0EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A0A0EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A0B0EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A0B0EB0B1A700768D1C /* PBXTextBookmark */;
+			34C17A0C0EB0B1A700768D1C /* PBXTextBookmark */ = 34C17A0C0EB0B1A700768D1C /* PBXTextBookmark */;
 		};
 		sourceControlManager = 347710780E8BD7BA0051DFFD /* Source Control */;
 		userBuildSettings = {
@@ -536,7 +590,7 @@
 		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
 		name = "SettingsViewController.h: 25";
 		rLen = 0;
-		rLoc = 387;
+		rLoc = 453;
 		rType = 0;
 		vrLen = 392;
 		vrLoc = 0;
@@ -576,7 +630,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 120";
 		rLen = 0;
-		rLoc = 4911;
+		rLoc = 5848;
 		rType = 0;
 		vrLen = 2049;
 		vrLoc = 2404;
@@ -735,7 +789,7 @@
 		ignoreCount = 0;
 		lineNumber = 124;
 		location = FixMyStreet;
-		modificationTime = 246457672.265263;
+		modificationTime = 246460659.706694;
 		state = 2;
 	};
 	345577B10EAE24B4008C5D7F /* PBXTextBookmark */ = {
@@ -772,7 +826,7 @@
 		ignoreCount = 0;
 		lineNumber = 124;
 		location = FixMyStreet;
-		modificationTime = 246457672.265285;
+		modificationTime = 246460659.706764;
 		state = 2;
 	};
 	345577D50EAE262C008C5D7F /* EditSubjectViewController.m:124 */ = {
@@ -789,7 +843,7 @@
 		ignoreCount = 0;
 		lineNumber = 124;
 		location = FixMyStreet;
-		modificationTime = 246457672.265292;
+		modificationTime = 246460659.706782;
 		state = 2;
 	};
 	345577E10EAE28E2008C5D7F /* PBXTextBookmark */ = {
@@ -857,7 +911,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 116";
 		rLen = 474;
-		rLoc = 4682;
+		rLoc = 5619;
 		rType = 0;
 		vrLen = 2102;
 		vrLoc = 2391;
@@ -907,7 +961,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 135";
 		rLen = 0;
-		rLoc = 5346;
+		rLoc = 6283;
 		rType = 0;
 		vrLen = 1733;
 		vrLoc = 3130;
@@ -957,7 +1011,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 102";
 		rLen = 0;
-		rLoc = 3411;
+		rLoc = 4303;
 		rType = 0;
 		vrLen = 1766;
 		vrLoc = 1961;
@@ -967,7 +1021,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 293";
 		rLen = 0;
-		rLoc = 9328;
+		rLoc = 9354;
 		rType = 0;
 		vrLen = 1880;
 		vrLoc = 8794;
@@ -1007,7 +1061,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 149";
 		rLen = 0;
-		rLoc = 5156;
+		rLoc = 6093;
 		rType = 0;
 		vrLen = 1798;
 		vrLoc = 3914;
@@ -1037,7 +1091,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 149";
 		rLen = 0;
-		rLoc = 5156;
+		rLoc = 6093;
 		rType = 0;
 		vrLen = 1798;
 		vrLoc = 3914;
@@ -1087,7 +1141,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 149";
 		rLen = 0;
-		rLoc = 5156;
+		rLoc = 6093;
 		rType = 0;
 		vrLen = 1798;
 		vrLoc = 3914;
@@ -1117,7 +1171,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 149";
 		rLen = 0;
-		rLoc = 5156;
+		rLoc = 6093;
 		rType = 0;
 		vrLen = 1798;
 		vrLoc = 3914;
@@ -1127,7 +1181,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 293";
 		rLen = 0;
-		rLoc = 9328;
+		rLoc = 9354;
 		rType = 0;
 		vrLen = 1884;
 		vrLoc = 8798;
@@ -1137,7 +1191,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 143";
 		rLen = 0;
-		rLoc = 4911;
+		rLoc = 5848;
 		rType = 0;
 		vrLen = 1798;
 		vrLoc = 3914;
@@ -1147,7 +1201,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 297";
 		rLen = 0;
-		rLoc = 9444;
+		rLoc = 9476;
 		rType = 0;
 		vrLen = 1831;
 		vrLoc = 8844;
@@ -1157,7 +1211,7 @@
 		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
 		name = "SettingsViewController.h: 25";
 		rLen = 0;
-		rLoc = 387;
+		rLoc = 453;
 		rType = 0;
 		vrLen = 392;
 		vrLoc = 0;
@@ -1167,7 +1221,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 30";
 		rLen = 0;
-		rLoc = 739;
+		rLoc = 763;
 		rType = 0;
 		vrLen = 1523;
 		vrLoc = 0;
@@ -1187,7 +1241,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 136";
 		rLen = 0;
-		rLoc = 4467;
+		rLoc = 5404;
 		rType = 0;
 		vrLen = 2023;
 		vrLoc = 3690;
@@ -1207,7 +1261,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 30";
 		rLen = 0;
-		rLoc = 765;
+		rLoc = 789;
 		rType = 0;
 		vrLen = 2092;
 		vrLoc = 3344;
@@ -1227,7 +1281,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 31";
 		rLen = 0;
-		rLoc = 822;
+		rLoc = 846;
 		rType = 0;
 		vrLen = 1780;
 		vrLoc = 162;
@@ -1247,7 +1301,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 138";
 		rLen = 0;
-		rLoc = 4682;
+		rLoc = 5619;
 		rType = 0;
 		vrLen = 2080;
 		vrLoc = 3469;
@@ -1327,7 +1381,7 @@
 		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
 		name = "SettingsViewController.h: 25";
 		rLen = 0;
-		rLoc = 387;
+		rLoc = 453;
 		rType = 0;
 		vrLen = 392;
 		vrLoc = 0;
@@ -1367,7 +1421,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 138";
 		rLen = 0;
-		rLoc = 4682;
+		rLoc = 5619;
 		rType = 0;
 		vrLen = 2105;
 		vrLoc = 3446;
@@ -1587,7 +1641,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 143";
 		rLen = 0;
-		rLoc = 4770;
+		rLoc = 5707;
 		rType = 0;
 		vrLen = 2055;
 		vrLoc = 3716;
@@ -1667,7 +1721,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 152";
 		rLen = 0;
-		rLoc = 5156;
+		rLoc = 6093;
 		rType = 0;
 		vrLen = 2138;
 		vrLoc = 3716;
@@ -1707,7 +1761,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 138";
 		rLen = 0;
-		rLoc = 4679;
+		rLoc = 5616;
 		rType = 0;
 		vrLen = 2138;
 		vrLoc = 3716;
@@ -1737,7 +1791,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 138";
 		rLen = 0;
-		rLoc = 4679;
+		rLoc = 5616;
 		rType = 0;
 		vrLen = 2180;
 		vrLoc = 3674;
@@ -1767,7 +1821,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 134";
 		rLen = 0;
-		rLoc = 4241;
+		rLoc = 5238;
 		rType = 0;
 		vrLen = 2206;
 		vrLoc = 3648;
@@ -1797,7 +1851,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 138";
 		rLen = 21;
-		rLoc = 4609;
+		rLoc = 5546;
 		rType = 0;
 		vrLen = 2206;
 		vrLoc = 3648;
@@ -1837,7 +1891,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 135";
 		rLen = 0;
-		rLoc = 4306;
+		rLoc = 5273;
 		rType = 0;
 		vrLen = 2310;
 		vrLoc = 3544;
@@ -1967,7 +2021,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 14";
 		rLen = 0;
-		rLoc = 311;
+		rLoc = 335;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 0;
@@ -2057,7 +2111,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 14";
 		rLen = 0;
-		rLoc = 311;
+		rLoc = 335;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 0;
@@ -2117,7 +2171,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 27";
 		rLen = 0;
-		rLoc = 736;
+		rLoc = 760;
 		rType = 0;
 		vrLen = 1518;
 		vrLoc = 0;
@@ -2177,7 +2231,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 62";
 		rLen = 0;
-		rLoc = 5148;
+		rLoc = 5621;
 		rType = 0;
 		vrLen = 2708;
 		vrLoc = 1648;
@@ -2197,7 +2251,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 100";
 		rLen = 0;
-		rLoc = 8901;
+		rLoc = 9374;
 		rType = 0;
 		vrLen = 4062;
 		vrLoc = 2090;
@@ -2327,7 +2381,7 @@
 		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
 		name = "InputTableViewController.h: 37";
 		rLen = 0;
-		rLoc = 1161;
+		rLoc = 1187;
 		rType = 0;
 		vrLen = 1173;
 		vrLoc = 0;
@@ -2337,7 +2391,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 91";
 		rLen = 0;
-		rLoc = 7667;
+		rLoc = 8140;
 		rType = 0;
 		vrLen = 3923;
 		vrLoc = 2335;
@@ -2357,7 +2411,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 91";
 		rLen = 0;
-		rLoc = 7667;
+		rLoc = 8140;
 		rType = 0;
 		vrLen = 4028;
 		vrLoc = 2230;
@@ -2397,7 +2451,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 27";
 		rLen = 0;
-		rLoc = 736;
+		rLoc = 760;
 		rType = 0;
 		vrLen = 1647;
 		vrLoc = 0;
@@ -2407,7 +2461,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 98";
 		rLen = 0;
-		rLoc = 8195;
+		rLoc = 8668;
 		rType = 0;
 		vrLen = 2665;
 		vrLoc = 1360;
@@ -2427,7 +2481,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 27";
 		rLen = 0;
-		rLoc = 736;
+		rLoc = 760;
 		rType = 0;
 		vrLen = 1647;
 		vrLoc = 0;
@@ -2447,7 +2501,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 309";
 		rLen = 0;
-		rLoc = 10069;
+		rLoc = 10179;
 		rType = 0;
 		vrLen = 1770;
 		vrLoc = 9171;
@@ -2457,7 +2511,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 123";
 		rLen = 0;
-		rLoc = 9366;
+		rLoc = 9927;
 		rType = 0;
 		vrLen = 3658;
 		vrLoc = 3439;
@@ -2487,7 +2541,7 @@
 		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
 		name = "InputTableViewController.h: 37";
 		rLen = 0;
-		rLoc = 1161;
+		rLoc = 1187;
 		rType = 0;
 		vrLen = 1173;
 		vrLoc = 0;
@@ -2497,7 +2551,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 309";
 		rLen = 0;
-		rLoc = 10069;
+		rLoc = 10179;
 		rType = 0;
 		vrLen = 1800;
 		vrLoc = 9140;
@@ -2537,7 +2591,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 123";
 		rLen = 0;
-		rLoc = 9366;
+		rLoc = 9927;
 		rType = 0;
 		vrLen = 3660;
 		vrLoc = 3437;
@@ -2587,7 +2641,7 @@
 		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
 		name = "InputTableViewController.h: 37";
 		rLen = 0;
-		rLoc = 1161;
+		rLoc = 1187;
 		rType = 0;
 		vrLen = 1173;
 		vrLoc = 0;
@@ -2597,7 +2651,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 309";
 		rLen = 0;
-		rLoc = 10069;
+		rLoc = 10179;
 		rType = 0;
 		vrLen = 1800;
 		vrLoc = 9140;
@@ -2637,7 +2691,7 @@
 		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
 		name = "FixMyStreetAppDelegate.m: 123";
 		rLen = 0;
-		rLoc = 9366;
+		rLoc = 9927;
 		rType = 0;
 		vrLen = 3660;
 		vrLoc = 3437;
@@ -2745,16 +2799,16 @@
 	347712720E8D367F0051DFFD /* InputTableViewController.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1229, 733}}";
-			sepNavSelRange = "{374, 9}";
-			sepNavVisRange = "{0, 1203}";
+			sepNavSelRange = "{843, 0}";
+			sepNavVisRange = "{0, 1229}";
 			sepNavWindowFrame = "{{153, 489}, {750, 558}}";
 		};
 	};
 	347712730E8D367F0051DFFD /* InputTableViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 4088}}";
-			sepNavSelRange = "{1697, 0}";
-			sepNavVisRange = "{3943, 1931}";
+			sepNavIntBoundsRect = "{{0, 0}, {1229, 4242}}";
+			sepNavSelRange = "{10166, 0}";
+			sepNavVisRange = "{8542, 1676}";
 			sepNavWindowFrame = "{{1082, 467}, {750, 558}}";
 		};
 	};
@@ -2804,16 +2858,16 @@
 	};
 	3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 756}}";
-			sepNavSelRange = "{136, 0}";
-			sepNavVisRange = "{0, 392}";
+			sepNavIntBoundsRect = "{{0, 0}, {1229, 733}}";
+			sepNavSelRange = "{452, 0}";
+			sepNavVisRange = "{0, 458}";
 		};
 	};
 	3481BD500EACF81D00C78F66 /* SettingsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 2478}}";
-			sepNavSelRange = "{736, 0}";
-			sepNavVisRange = "{3715, 1871}";
+			sepNavIntBoundsRect = "{{0, 0}, {1229, 2758}}";
+			sepNavSelRange = "{1241, 0}";
+			sepNavVisRange = "{48, 1576}";
 		};
 	};
 	3499E5A30E95311A006F2DA2 /* .cvsignore */ = {
@@ -2928,7 +2982,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 27";
 		rLen = 0;
-		rLoc = 736;
+		rLoc = 760;
 		rType = 0;
 		vrLen = 1871;
 		vrLoc = 3715;
@@ -3089,7 +3143,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 300";
 		rLen = 8;
-		rLoc = 9783;
+		rLoc = 9880;
 		rType = 0;
 		vrLen = 1801;
 		vrLoc = 9162;
@@ -3169,7 +3223,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 27";
 		rLen = 0;
-		rLoc = 736;
+		rLoc = 760;
 		rType = 0;
 		vrLen = 1738;
 		vrLoc = 0;
@@ -3229,7 +3283,7 @@
 		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
 		name = "SettingsViewController.m: 27";
 		rLen = 0;
-		rLoc = 736;
+		rLoc = 760;
 		rType = 0;
 		vrLen = 1871;
 		vrLoc = 3715;
@@ -3440,7 +3494,7 @@
 		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
 		name = "InputTableViewController.m: 241";
 		rLen = 0;
-		rLoc = 8516;
+		rLoc = 8514;
 		rType = 0;
 		vrLen = 1363;
 		vrLoc = 7474;
@@ -3765,4 +3819,554 @@
 		vrLen = 2737;
 		vrLoc = 89;
 	};
+	34C179B40EB0A9B100768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 43";
+		rLen = 0;
+		rLoc = 2210;
+		rType = 0;
+		vrLen = 2766;
+		vrLoc = 89;
+	};
+	34C179B50EB0A9B100768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 184";
+		rLen = 0;
+		rLoc = 9871;
+		rType = 0;
+		vrLen = 4860;
+		vrLoc = 32;
+	};
+	34C179B70EB0A9BA00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 12";
+		rLen = 0;
+		rLoc = 235;
+		rType = 0;
+		vrLen = 4743;
+		vrLoc = 32;
+	};
+	34C179BA0EB0A9F700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 11";
+		rLen = 0;
+		rLoc = 235;
+		rType = 0;
+		vrLen = 5445;
+		vrLoc = 0;
+	};
+	34C179BD0EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 11";
+		rLen = 0;
+		rLoc = 235;
+		rType = 0;
+		vrLen = 5642;
+		vrLoc = 3;
+	};
+	34C179BE0EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
+		name = "SettingsViewController.h: 23";
+		rLen = 0;
+		rLoc = 452;
+		rType = 0;
+		vrLen = 458;
+		vrLoc = 0;
+	};
+	34C179BF0EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 39";
+		rLen = 0;
+		rLoc = 1215;
+		rType = 0;
+		vrLen = 1783;
+		vrLoc = 311;
+	};
+	34C179C00EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 11";
+		rLen = 0;
+		rLoc = 235;
+		rType = 0;
+		vrLen = 5642;
+		vrLoc = 3;
+	};
+	34C179C10EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
+		name = "SettingsViewController.h: 6";
+		rLen = 0;
+		rLoc = 136;
+		rType = 0;
+		vrLen = 392;
+		vrLoc = 0;
+	};
+	34C179C20EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 39";
+		rLen = 0;
+		rLoc = 1215;
+		rType = 0;
+		vrLen = 1803;
+		vrLoc = 311;
+	};
+	34C179C30EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
+		name = "SettingsViewController.h: 23";
+		rLen = 0;
+		rLoc = 452;
+		rType = 0;
+		vrLen = 458;
+		vrLoc = 0;
+	};
+	34C179C40EB0AC9800768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 16";
+		rLen = 0;
+		rLoc = 335;
+		rType = 0;
+		vrLen = 1465;
+		vrLoc = 0;
+	};
+	34C179C60EB0AD1600768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 16";
+		rLen = 0;
+		rLoc = 335;
+		rType = 0;
+		vrLen = 1575;
+		vrLoc = 0;
+	};
+	34C179C70EB0AD1600768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
+		name = "InputTableViewController.h: 31";
+		rLen = 0;
+		rLoc = 858;
+		rType = 0;
+		vrLen = 1219;
+		vrLoc = 0;
+	};
+	34C179C80EB0AD1600768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 271";
+		rLen = 0;
+		rLoc = 9349;
+		rType = 0;
+		vrLen = 1928;
+		vrLoc = 8252;
+	};
+	34C179C90EB0AD1600768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 16";
+		rLen = 0;
+		rLoc = 335;
+		rType = 0;
+		vrLen = 1575;
+		vrLoc = 0;
+	};
+	34C179CA0EB0AD1600768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 271";
+		rLen = 0;
+		rLoc = 9349;
+		rType = 0;
+		vrLen = 1928;
+		vrLoc = 8252;
+	};
+	34C179CB0EB0AD1600768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
+		name = "InputTableViewController.h: 31";
+		rLen = 0;
+		rLoc = 858;
+		rType = 0;
+		vrLen = 1219;
+		vrLoc = 0;
+	};
+	34C179CC0EB0AD1600768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 275";
+		rLen = 0;
+		rLoc = 9497;
+		rType = 0;
+		vrLen = 1760;
+		vrLoc = 8400;
+	};
+	34C179CF0EB0AD4A00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
+		name = "InputTableViewController.h: 31";
+		rLen = 0;
+		rLoc = 843;
+		rType = 0;
+		vrLen = 1229;
+		vrLoc = 0;
+	};
+	34C179D00EB0AD4A00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 275";
+		rLen = 0;
+		rLoc = 9497;
+		rType = 0;
+		vrLen = 1687;
+		vrLoc = 8510;
+	};
+	34C179D10EB0AD4A00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 275";
+		rLen = 0;
+		rLoc = 9497;
+		rType = 0;
+		vrLen = 1687;
+		vrLoc = 8510;
+	};
+	34C179D20EB0AD4A00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
+		name = "InputTableViewController.h: 31";
+		rLen = 0;
+		rLoc = 843;
+		rType = 0;
+		vrLen = 1229;
+		vrLoc = 0;
+	};
+	34C179D30EB0AD4A00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 270";
+		rLen = 0;
+		rLoc = 9307;
+		rType = 0;
+		vrLen = 1708;
+		vrLoc = 8511;
+	};
+	34C179D50EB0AD5C00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 241";
+		rLen = 9;
+		rLoc = 8512;
+		rType = 0;
+		vrLen = 754;
+		vrLoc = 8079;
+	};
+	34C179D70EB0AD5F00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 254";
+		rLen = 0;
+		rLoc = 8847;
+		rType = 0;
+		vrLen = 1708;
+		vrLoc = 8511;
+	};
+	34C179DA0EB0AD8B00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 241";
+		rLen = 9;
+		rLoc = 8512;
+		rType = 0;
+		vrLen = 754;
+		vrLoc = 8079;
+	};
+	34C179DC0EB0ADE000768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 266";
+		rLen = 0;
+		rLoc = 9248;
+		rType = 0;
+		vrLen = 1708;
+		vrLoc = 8511;
+	};
+	34C179DD0EB0ADE000768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 16";
+		rLen = 0;
+		rLoc = 335;
+		rType = 0;
+		vrLen = 1543;
+		vrLoc = 32;
+	};
+	34C179DE0EB0ADE000768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 266";
+		rLen = 0;
+		rLoc = 9248;
+		rType = 0;
+		vrLen = 1708;
+		vrLoc = 8511;
+	};
+	34C179DF0EB0ADE000768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 63";
+		rLen = 0;
+		rLoc = 2393;
+		rType = 0;
+		vrLen = 2003;
+		vrLoc = 1229;
+	};
+	34C179E10EB0AE1400768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 150";
+		rLen = 0;
+		rLoc = 5187;
+		rType = 0;
+		vrLen = 1931;
+		vrLoc = 684;
+	};
+	34C179E50EB0AE7E00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 67";
+		rLen = 0;
+		rLoc = 2393;
+		rType = 0;
+		vrLen = 1971;
+		vrLoc = 1340;
+	};
+	34C179E70EB0AEE000768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 63";
+		rLen = 0;
+		rLoc = 2272;
+		rType = 0;
+		vrLen = 1966;
+		vrLoc = 1128;
+	};
+	34C179E90EB0AEFF00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 62";
+		rLen = 0;
+		rLoc = 2112;
+		rType = 0;
+		vrLen = 1937;
+		vrLoc = 1127;
+	};
+	34C179EB0EB0AF5400768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 65";
+		rLen = 0;
+		rLoc = 2239;
+		rType = 0;
+		vrLen = 1881;
+		vrLoc = 1127;
+	};
+	34C179ED0EB0AF6F00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 62";
+		rLen = 0;
+		rLoc = 2104;
+		rType = 0;
+		vrLen = 1880;
+		vrLoc = 1127;
+	};
+	34C179EF0EB0AFA100768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 62";
+		rLen = 0;
+		rLoc = 2109;
+		rType = 0;
+		vrLen = 1886;
+		vrLoc = 1127;
+	};
+	34C179F10EB0AFFB00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 62";
+		rLen = 0;
+		rLoc = 2112;
+		rType = 0;
+		vrLen = 2013;
+		vrLoc = 1127;
+	};
+	34C179F30EB0B03500768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 66";
+		rLen = 0;
+		rLoc = 2321;
+		rType = 0;
+		vrLen = 1901;
+		vrLoc = 1127;
+	};
+	34C179F50EB0B04500768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 66";
+		rLen = 0;
+		rLoc = 2291;
+		rType = 0;
+		vrLen = 1902;
+		vrLoc = 1127;
+	};
+	34C179F70EB0B0B100768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 56";
+		rLen = 0;
+		rLoc = 1606;
+		rType = 0;
+		vrLen = 1841;
+		vrLoc = 1127;
+	};
+	34C179F90EB0B0C900768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 68";
+		rLen = 0;
+		rLoc = 2098;
+		rType = 0;
+		vrLen = 1840;
+		vrLoc = 1127;
+	};
+	34C179FB0EB0B0DB00768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 56";
+		rLen = 0;
+		rLoc = 1603;
+		rType = 0;
+		vrLen = 1840;
+		vrLoc = 1127;
+	};
+	34C179FD0EB0B0F000768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 72";
+		rLen = 0;
+		rLoc = 2286;
+		rType = 0;
+		vrLen = 1846;
+		vrLoc = 1127;
+	};
+	34C17A030EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
+		name = "SettingsViewController.h: 23";
+		rLen = 0;
+		rLoc = 452;
+		rType = 0;
+		vrLen = 458;
+		vrLoc = 0;
+	};
+	34C17A040EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 11";
+		rLen = 0;
+		rLoc = 235;
+		rType = 0;
+		vrLen = 2124;
+		vrLoc = 2557;
+	};
+	34C17A050EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 288";
+		rLen = 0;
+		rLoc = 10166;
+		rType = 0;
+		vrLen = 1676;
+		vrLoc = 8542;
+	};
+	34C17A060EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 20";
+		rLen = 0;
+		rLoc = 555;
+		rType = 0;
+		vrLen = 1893;
+		vrLoc = 3764;
+	};
+	34C17A070EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 20";
+		rLen = 0;
+		rLoc = 555;
+		rType = 0;
+		vrLen = 1575;
+		vrLoc = 51;
+	};
+	34C17A080EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
+		name = "SettingsViewController.h: 23";
+		rLen = 0;
+		rLoc = 452;
+		rType = 0;
+		vrLen = 458;
+		vrLoc = 0;
+	};
+	34C17A090EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 20";
+		rLen = 0;
+		rLoc = 555;
+		rType = 0;
+		vrLen = 2084;
+		vrLoc = 3764;
+	};
+	34C17A0A0EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
+		name = "FixMyStreetAppDelegate.m: 11";
+		rLen = 0;
+		rLoc = 235;
+		rType = 0;
+		vrLen = 2124;
+		vrLoc = 2557;
+	};
+	34C17A0B0EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
+		name = "InputTableViewController.m: 288";
+		rLen = 0;
+		rLoc = 10166;
+		rType = 0;
+		vrLen = 1676;
+		vrLoc = 8542;
+	};
+	34C17A0C0EB0B1A700768D1C /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
+		name = "SettingsViewController.m: 43";
+		rLen = 0;
+		rLoc = 1241;
+		rType = 0;
+		vrLen = 1576;
+		vrLoc = 48;
+	};
 }
diff --git a/iphone/FixMyStreet/MainViewController.xib b/iphone/FixMyStreet/MainViewController.xib
index 531aa1ad3..670f8fcb0 100644
--- a/iphone/FixMyStreet/MainViewController.xib
+++ b/iphone/FixMyStreet/MainViewController.xib
@@ -145,12 +145,12 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">gotoSettings:</string>
+						<string key="label">gotoSettings:firstTime:</string>
 						<reference key="source" ref="323841673"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">7</int>
 					</object>
-					<int key="connectionID">25</int>
+					<int key="connectionID">26</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -246,7 +246,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">25</int>
+			<int key="maxID">26</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -259,7 +259,7 @@
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addPhoto:</string>
-							<string>gotoSettings:</string>
+							<string>gotoSettings:firstTime:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -272,14 +272,12 @@
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>actionsToDoView</string>
-							<string>flipDelegate</string>
 							<string>imageView</string>
 							<string>settingsButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>UITableView</string>
-							<string>id</string>
 							<string>UIImageView</string>
 							<string>UIButton</string>
 						</object>