diff --git a/ShortNotes/ShortNotes.xcodeproj/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ShortNotes/ShortNotes.xcodeproj/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index e949e11..b5a460e 100644
--- a/ShortNotes/ShortNotes.xcodeproj/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/ShortNotes/ShortNotes.xcodeproj/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507584.531521"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "160"
-            endingLineNumber = "160"
+            startingLineNumber = "163"
+            endingLineNumber = "163"
             landmarkName = "-hideLoginScreen"
             landmarkType = "5">
          </BreakpointContent>
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "246"
-            endingLineNumber = "246"
+            startingLineNumber = "249"
+            endingLineNumber = "249"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
-            endingLineNumber = "256"
+            startingLineNumber = "259"
+            endingLineNumber = "259"
             landmarkName = "-numberOfSectionsInTableView:"
             landmarkType = "5">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "322"
-            endingLineNumber = "322"
+            startingLineNumber = "325"
+            endingLineNumber = "325"
             landmarkName = "@implementation ViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -106,11 +106,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "310"
-            endingLineNumber = "310"
+            startingLineNumber = "313"
+            endingLineNumber = "313"
             landmarkName = "-tableView:editActionsForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
diff --git a/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/UserInterfaceState.xcuserstate b/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/UserInterfaceState.xcuserstate
index f14eefe..6bc1a6a 100644
Binary files a/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/UserInterfaceState.xcuserstate and b/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 66eef17..f02931b 100644
--- a/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/ShortNotes/ShortNotes.xcworkspace/xcuserdata/Sanjith.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/CreateEditViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499544625.183097"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "80"
-            endingLineNumber = "80"
+            startingLineNumber = "79"
+            endingLineNumber = "79"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "5">
          </BreakpointContent>
@@ -106,11 +106,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/CreateEditViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499544625.183097"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "180"
-            endingLineNumber = "180"
+            startingLineNumber = "179"
+            endingLineNumber = "179"
             landmarkName = "-keyboardWillBeHidden:"
             landmarkType = "5">
          </BreakpointContent>
@@ -122,11 +122,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/CreateEditViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499544625.183097"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "131"
-            endingLineNumber = "131"
+            startingLineNumber = "130"
+            endingLineNumber = "130"
             landmarkName = "-keyboardDidShow:"
             landmarkType = "5">
          </BreakpointContent>
@@ -138,11 +138,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507584.531521"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "204"
-            endingLineNumber = "204"
+            startingLineNumber = "207"
+            endingLineNumber = "207"
             landmarkName = "-loginDropBox"
             landmarkType = "5">
          </BreakpointContent>
@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "369"
-            endingLineNumber = "369"
+            startingLineNumber = "372"
+            endingLineNumber = "372"
             landmarkName = "-accountUpdated:"
             landmarkType = "5">
          </BreakpointContent>
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "374"
-            endingLineNumber = "374"
+            startingLineNumber = "377"
+            endingLineNumber = "377"
             landmarkName = "-accountUpdated:"
             landmarkType = "5">
          </BreakpointContent>
@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "405"
-            endingLineNumber = "405"
+            startingLineNumber = "408"
+            endingLineNumber = "408"
             landmarkName = "@implementation ViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -218,11 +218,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "265"
-            endingLineNumber = "265"
+            startingLineNumber = "268"
+            endingLineNumber = "268"
             landmarkName = "-tableView:numberOfRowsInSection:"
             landmarkType = "5">
          </BreakpointContent>
@@ -234,11 +234,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "276"
-            endingLineNumber = "276"
+            startingLineNumber = "279"
+            endingLineNumber = "279"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -250,11 +250,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "292"
-            endingLineNumber = "292"
+            startingLineNumber = "295"
+            endingLineNumber = "295"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -266,11 +266,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "430"
-            endingLineNumber = "430"
+            startingLineNumber = "433"
+            endingLineNumber = "433"
             landmarkName = "-loadFiles"
             landmarkType = "5">
          </BreakpointContent>
@@ -298,11 +298,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "287"
-            endingLineNumber = "287"
+            startingLineNumber = "290"
+            endingLineNumber = "290"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -314,11 +314,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "286"
-            endingLineNumber = "286"
+            startingLineNumber = "289"
+            endingLineNumber = "289"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -330,11 +330,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "250"
-            endingLineNumber = "250"
+            startingLineNumber = "253"
+            endingLineNumber = "253"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -346,11 +346,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "331"
-            endingLineNumber = "331"
+            startingLineNumber = "334"
+            endingLineNumber = "334"
             landmarkName = "-prepareForSegue:sender:"
             landmarkType = "5">
          </BreakpointContent>
@@ -362,11 +362,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "265"
-            endingLineNumber = "265"
+            startingLineNumber = "268"
+            endingLineNumber = "268"
             landmarkName = "-tableView:numberOfRowsInSection:"
             landmarkType = "5">
          </BreakpointContent>
@@ -394,11 +394,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "366"
-            endingLineNumber = "366"
+            startingLineNumber = "369"
+            endingLineNumber = "369"
             landmarkName = "-accountUpdated:"
             landmarkType = "5">
          </BreakpointContent>
@@ -410,11 +410,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "381"
-            endingLineNumber = "381"
+            startingLineNumber = "384"
+            endingLineNumber = "384"
             landmarkName = "-dropBoxAccountInit"
             landmarkType = "5">
          </BreakpointContent>
@@ -426,11 +426,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "421"
-            endingLineNumber = "421"
+            startingLineNumber = "424"
+            endingLineNumber = "424"
             landmarkName = "-loadFiles"
             landmarkType = "5">
          </BreakpointContent>
@@ -442,11 +442,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "355"
-            endingLineNumber = "355"
+            startingLineNumber = "358"
+            endingLineNumber = "358"
             landmarkName = "-getDropboxAccount"
             landmarkType = "5">
          </BreakpointContent>
@@ -458,11 +458,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "356"
-            endingLineNumber = "356"
+            startingLineNumber = "359"
+            endingLineNumber = "359"
             landmarkName = "-getDropboxAccount"
             landmarkType = "5">
          </BreakpointContent>
@@ -474,11 +474,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "398"
-            endingLineNumber = "398"
+            startingLineNumber = "401"
+            endingLineNumber = "401"
             landmarkName = "-reloadData"
             landmarkType = "5">
          </BreakpointContent>
@@ -538,11 +538,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "448"
-            endingLineNumber = "448"
+            startingLineNumber = "451"
+            endingLineNumber = "451"
             landmarkName = "-loadFileData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -554,11 +554,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "452"
-            endingLineNumber = "452"
+            startingLineNumber = "455"
+            endingLineNumber = "455"
             landmarkName = "-loadFileData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -570,11 +570,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "440"
-            endingLineNumber = "440"
+            startingLineNumber = "443"
+            endingLineNumber = "443"
             landmarkName = "-loadFileData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -648,11 +648,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507584.531521"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "179"
-            endingLineNumber = "179"
+            startingLineNumber = "182"
+            endingLineNumber = "182"
             landmarkName = "-initLocalVariables"
             landmarkType = "5">
          </BreakpointContent>
@@ -664,11 +664,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "401"
-            endingLineNumber = "401"
+            startingLineNumber = "404"
+            endingLineNumber = "404"
             landmarkName = "-reloadData"
             landmarkType = "5">
          </BreakpointContent>
@@ -680,11 +680,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "446"
-            endingLineNumber = "446"
+            startingLineNumber = "449"
+            endingLineNumber = "449"
             landmarkName = "-loadFileData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -696,11 +696,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "456"
-            endingLineNumber = "456"
+            startingLineNumber = "459"
+            endingLineNumber = "459"
             landmarkName = "-loadFileData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -712,11 +712,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "365"
-            endingLineNumber = "365"
+            startingLineNumber = "368"
+            endingLineNumber = "368"
             landmarkName = "-accountUpdated:"
             landmarkType = "5">
          </BreakpointContent>
@@ -728,11 +728,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "344"
-            endingLineNumber = "344"
+            startingLineNumber = "347"
+            endingLineNumber = "347"
             landmarkName = "-prepareForSegue:sender:"
             landmarkType = "5">
          </BreakpointContent>
@@ -744,11 +744,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/CreateEditViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499544625.183097"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "210"
-            endingLineNumber = "210"
+            startingLineNumber = "209"
+            endingLineNumber = "209"
             landmarkName = "-saveAction:"
             landmarkType = "5">
          </BreakpointContent>
@@ -760,11 +760,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "332"
-            endingLineNumber = "332"
+            startingLineNumber = "335"
+            endingLineNumber = "335"
             landmarkName = "-prepareForSegue:sender:"
             landmarkType = "5">
          </BreakpointContent>
@@ -776,11 +776,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "341"
-            endingLineNumber = "341"
+            startingLineNumber = "344"
+            endingLineNumber = "344"
             landmarkName = "-prepareForSegue:sender:"
             landmarkType = "5">
          </BreakpointContent>
@@ -792,11 +792,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "334"
-            endingLineNumber = "334"
+            startingLineNumber = "337"
+            endingLineNumber = "337"
             landmarkName = "-prepareForSegue:sender:"
             landmarkType = "5">
          </BreakpointContent>
@@ -808,11 +808,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "335"
-            endingLineNumber = "335"
+            startingLineNumber = "338"
+            endingLineNumber = "338"
             landmarkName = "-prepareForSegue:sender:"
             landmarkType = "5">
          </BreakpointContent>
@@ -824,11 +824,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "414"
-            endingLineNumber = "414"
+            startingLineNumber = "417"
+            endingLineNumber = "417"
             landmarkName = "sortFileInfos()"
             landmarkType = "7">
          </BreakpointContent>
@@ -840,11 +840,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "282"
-            endingLineNumber = "282"
+            startingLineNumber = "285"
+            endingLineNumber = "285"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -856,11 +856,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "281"
-            endingLineNumber = "281"
+            startingLineNumber = "284"
+            endingLineNumber = "284"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -872,11 +872,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499507667.757383"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "218"
-            endingLineNumber = "218"
+            startingLineNumber = "221"
+            endingLineNumber = "221"
             landmarkName = "-logoutAction:"
             landmarkType = "5">
          </BreakpointContent>
@@ -888,11 +888,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "388"
-            endingLineNumber = "388"
+            startingLineNumber = "391"
+            endingLineNumber = "391"
             landmarkName = "-dropBoxAccountInit"
             landmarkType = "5">
             <Locations>
@@ -904,12 +904,12 @@
                   moduleName = "ShortNotes"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/phil/Desktop/GitHub%20Sources/ShortNotes-iOS/ShortNotes/ShortNotes/ViewController.m"
-                  timestampString = "499516094.520123"
+                  timestampString = "499544527.180021"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "388"
-                  endingLineNumber = "388"
-                  offsetFromSymbolStart = "482">
+                  startingLineNumber = "391"
+                  endingLineNumber = "391"
+                  offsetFromSymbolStart = "480">
                </Location>
                <Location
                   shouldBeEnabled = "Yes"
@@ -919,12 +919,12 @@
                   moduleName = "ShortNotes"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/phil/Desktop/GitHub%20Sources/ShortNotes-iOS/ShortNotes/ShortNotes/ViewController.m"
-                  timestampString = "499516094.520327"
+                  timestampString = "499544527.180152"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "389"
-                  endingLineNumber = "389"
-                  offsetFromSymbolStart = "28">
+                  startingLineNumber = "392"
+                  endingLineNumber = "392"
+                  offsetFromSymbolStart = "20">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -936,11 +936,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "452"
-            endingLineNumber = "452"
+            startingLineNumber = "455"
+            endingLineNumber = "455"
             landmarkName = "-loadFileData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -952,11 +952,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/ViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499543914.464316"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "452"
-            endingLineNumber = "452"
+            startingLineNumber = "455"
+            endingLineNumber = "455"
             landmarkName = "-loadFileData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -968,14 +968,110 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ShortNotes/CreateEditViewController.m"
-            timestampString = "499516094.349723"
+            timestampString = "499544625.183097"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "228"
-            endingLineNumber = "228"
+            startingLineNumber = "227"
+            endingLineNumber = "227"
             landmarkName = "-saveFunction"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ShortNotes/CreateEditViewController.m"
+            timestampString = "499544625.183097"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "161"
+            endingLineNumber = "161"
+            landmarkName = "-keyboardDidChangeFrame:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ShortNotes/CreateEditViewController.m"
+            timestampString = "499544266.39622"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "24"
+            endingLineNumber = "24"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ShortNotes/CreateEditViewController.m"
+            timestampString = "499544527.078478"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "64"
+            endingLineNumber = "64"
+            landmarkName = "-configureBaseScreen"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ShortNotes/CreateEditViewController.m"
+            timestampString = "499544625.183097"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "71"
+            endingLineNumber = "71"
+            landmarkName = "-configureBaseScreen"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ShortNotes/CreateEditViewController.m"
+            timestampString = "499544625.183097"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "80"
+            endingLineNumber = "80"
+            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ShortNotes/CreateEditViewController.m"
+            timestampString = "499544625.183097"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "139"
+            endingLineNumber = "139"
+            landmarkName = "-keyboardDidChangeFrame:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/ShortNotes/ShortNotes/AppDelegate.m b/ShortNotes/ShortNotes/AppDelegate.m
index 6866958..dbd19f1 100644
--- a/ShortNotes/ShortNotes/AppDelegate.m
+++ b/ShortNotes/ShortNotes/AppDelegate.m
@@ -11,7 +11,7 @@
 #import <Dropbox/Dropbox.h>
 
 @interface AppDelegate ()
-    @property(nonatomic,retain)UINavigationController *rootController;
+
 @end
 
 @implementation AppDelegate
diff --git a/ShortNotes/ShortNotes/CreateEditViewController.h b/ShortNotes/ShortNotes/CreateEditViewController.h
index e03c3e5..c7aa7dc 100644
--- a/ShortNotes/ShortNotes/CreateEditViewController.h
+++ b/ShortNotes/ShortNotes/CreateEditViewController.h
@@ -19,5 +19,5 @@
     @property (strong, nonatomic) DBFileInfo *dbFileInfo;
     @property (strong, nonatomic) DBFilesystem *fileSystem;
     @property (strong, nonatomic) DBPath *rootPath;
-    @property BOOL isCreate;
+    @property (nonatomic) BOOL isCreate;
 @end
diff --git a/ShortNotes/ShortNotes/CreateEditViewController.m b/ShortNotes/ShortNotes/CreateEditViewController.m
index 856e3b1..eed3fe7 100644
--- a/ShortNotes/ShortNotes/CreateEditViewController.m
+++ b/ShortNotes/ShortNotes/CreateEditViewController.m
@@ -62,11 +62,10 @@ -(void) initLocalVariables {
 -(void) configureBaseScreen {
     [Utility styleNaviBar];
     self.dataText.font = [UIFont fontWithName:fontName size:20.0];
-    [self.dataText setUserInteractionEnabled:YES];
-    self.dataText.scrollEnabled = NO;
+    self.dataText.userInteractionEnabled = YES;
     self.dataText.scrollEnabled = YES;
     [self.dataText sizeToFit];
-    [self.dataText setContentInset:UIEdgeInsetsMake(-10.0, 0, -5.0, 0)];
+    self.dataText.contentInset = UIEdgeInsetsMake(-10.0, 0, -5.0, 0);
     self.dataText.delegate = self;
     self.dataText.text = self.dataTextStr;
     self.navigationBar.topItem.title =  (self.isCreate) ? createStr : editStr ;
diff --git a/ShortNotes/ShortNotes/CustomRowAction.h b/ShortNotes/ShortNotes/CustomRowAction.h
index fafdbf0..f927dac 100644
--- a/ShortNotes/ShortNotes/CustomRowAction.h
+++ b/ShortNotes/ShortNotes/CustomRowAction.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 @interface CustomRowAction : UITableViewRowAction
-    @property UIImage *actionImage;
-    @property UIFont *font;
+    @property(strong,nonatomic) UIImage *actionImage;
+    @property(strong,nonatomic) UIFont *font;
     + (instancetype)rowActionWithStyle:(UITableViewRowActionStyle)style title:(NSString *)title icon:(UIImage*)icon handler:(void (^)(UITableViewRowAction *action, NSIndexPath *indexPath))handler;
 @end
diff --git a/ShortNotes/ShortNotes/NoteData.h b/ShortNotes/ShortNotes/NoteData.h
index a9c00f8..d5644f6 100644
--- a/ShortNotes/ShortNotes/NoteData.h
+++ b/ShortNotes/ShortNotes/NoteData.h
@@ -10,7 +10,7 @@
 #import "Dropbox/Dropbox.h"
 
 @interface NoteData : NSObject
-    @property NSString *noteDesc;
-    @property DBFileInfo *dbFileInfo;
+    @property(strong,nonatomic) NSString *noteDesc;
+    @property(strong,nonatomic) DBFileInfo *dbFileInfo;
 @end
 
diff --git a/ShortNotes/ShortNotes/NoteViewCell.m b/ShortNotes/ShortNotes/NoteViewCell.m
index 1785d33..d646a66 100644
--- a/ShortNotes/ShortNotes/NoteViewCell.m
+++ b/ShortNotes/ShortNotes/NoteViewCell.m
@@ -17,24 +17,24 @@ - (void)awakeFromNib {
 }
 
 -(void) styleView {
-    [self.noteBackgroundView.layer setCornerRadius:30.0f];
-    [self.noteBackgroundView.layer setBorderColor:[UIColor lightGrayColor].CGColor];
-    [self.noteBackgroundView.layer setBorderWidth:1.5f];
-    [self.noteBackgroundView.layer setShadowColor:[UIColor blackColor].CGColor];
-    [self.noteBackgroundView.layer setShadowOpacity:0.8];
-    [self.noteBackgroundView.layer setShadowRadius:3.0];
-    [self.noteBackgroundView.layer setShadowOffset:CGSizeMake(2.0, 2.0)];
+    self.noteBackgroundView.layer.cornerRadius = 30.0f;
+    self.noteBackgroundView.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    self.noteBackgroundView.layer.borderWidth = 1.5f;
+    self.noteBackgroundView.layer.shadowColor = [UIColor blackColor].CGColor;
+    self.noteBackgroundView.layer.shadowOpacity = 0.8;
+    self.noteBackgroundView.layer.shadowRadius = 3.0;
+    self.noteBackgroundView.layer.shadowOffset = CGSizeMake(2.0, 2.0);
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
     UIView * selectedBackgroundView = [[UIView alloc] initWithFrame:self.noteBackgroundView.frame];
-    [selectedBackgroundView setBackgroundColor:[UIColor whiteColor]]; 
+    selectedBackgroundView.backgroundColor = [UIColor whiteColor];
     [self setSelectedBackgroundView:selectedBackgroundView];
 }
 
 -(void) setViewColour : (UIColor *) color{
-    [self.noteBackgroundView setBackgroundColor:color];
+    self.noteBackgroundView.backgroundColor = color;
 }
 
 @end
diff --git a/ShortNotes/ShortNotes/ViewController.m b/ShortNotes/ShortNotes/ViewController.m
index 176d611..b958b2d 100644
--- a/ShortNotes/ShortNotes/ViewController.m
+++ b/ShortNotes/ShortNotes/ViewController.m
@@ -76,7 +76,7 @@ -(void) showSyncStatus {
     else {
         return; //Sync view is already in progress
     }
-    [self.syncStatusView setBackgroundColor:[Utility colorFromHexString:orangeColor1]];
+    self.syncStatusView.backgroundColor = [Utility colorFromHexString:orangeColor1];
     UILabel *syncLable = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.syncStatusView.frame.size.width, self.syncStatusView.frame.size.height)];
     syncLable.center = CGPointMake(self.syncStatusView.frame.size.width/2, self.syncStatusView.frame.size.height/2);
     syncLable.textAlignment  = NSTextAlignmentCenter;
@@ -96,7 +96,7 @@ -(void) hideSyncStatus {
         return;
     }
     [UIView animateWithDuration:2 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
-        [self.syncStatusView setFrame:CGRectMake(self.syncStatusView.frame.origin.x, self.syncStatusView.frame.origin.y-30, self.syncStatusView.frame.size.width,self.syncStatusView.frame.size.height )];
+        self.syncStatusView.frame = CGRectMake(self.syncStatusView.frame.origin.x, self.syncStatusView.frame.origin.y-30, self.syncStatusView.frame.size.width,self.syncStatusView.frame.size.height );
     } completion:^(BOOL finished){
         [self.syncStatusView removeFromSuperview];
         self.syncStatusView = nil;
@@ -110,9 +110,9 @@ -(void) hideSyncStatus {
  */
 -(void) configureBaseScreen {
     UIButton *addButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    addButton.frame = CGRectMake(0,0,60, 60);
+    addButton.center = CGPointMake((SCREEN_CENTER_X*2)-40, (SCREEN_CENTER_Y*2)-40);
     [addButton setBackgroundImage:[UIImage imageNamed:addNoteBtn] forState:UIControlStateNormal];
-    [addButton setFrame:CGRectMake(0,0,60, 60)];
-    [addButton setCenter:CGPointMake((SCREEN_CENTER_X*2)-40, (SCREEN_CENTER_Y*2)-40)];
     [addButton addTarget:self action:@selector(createNewNoteAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:addButton];
     [Utility styleNaviBar];
@@ -131,19 +131,22 @@ -(void) showLoginScreen {
         return ;
     }
     self.loginView = [[UIView alloc]initWithFrame:CGRectMake(self.view.frame.origin.x, self.view.frame.origin.y,self.view.frame.size.width, self.view.frame.size.height)];
+    
     UIVisualEffect *blurEffect;
     blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight];
+    
     UIVisualEffectView *visualEffectView;
     visualEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect];
     visualEffectView.frame = self.loginView.bounds;
+    
     UIImageView *loginImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:iconImg]];
-    [loginImage setFrame:CGRectMake(0, 0, 100, 100)];
-    [loginImage setCenter:CGPointMake(SCREEN_CENTER_X,SCREEN_CENTER_Y)];
+    loginImage.frame = CGRectMake(0, 0, 100, 100);
+    loginImage.center = CGPointMake(SCREEN_CENTER_X,SCREEN_CENTER_Y);
     
     UIButton *loginButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    [loginButton setBackgroundImage:[UIImage imageNamed:loginBtn] forState:UIControlStateNormal];
     loginButton.frame = CGRectMake(0, 0, 210, 55);
-    [loginButton setCenter:CGPointMake(SCREEN_CENTER_X,(SCREEN_CENTER_Y*2)-100)];
+    loginButton.center = CGPointMake(SCREEN_CENTER_X,(SCREEN_CENTER_Y*2)-100);
+    [loginButton setBackgroundImage:[UIImage imageNamed:loginBtn] forState:UIControlStateNormal];
     [loginButton addTarget:self action:@selector(loginDropBox) forControlEvents:UIControlEventTouchUpInside];
     [self.loginView addSubview:visualEffectView];
     [self.loginView addSubview:loginImage];
diff --git a/ShortNotes/Utility.h b/ShortNotes/Utility.h
index dcef8c0..639513d 100644
--- a/ShortNotes/Utility.h
+++ b/ShortNotes/Utility.h
@@ -11,8 +11,7 @@
 #import "SCLAlertView.h"
 #import "Constants.h"
 
-@interface Utility : NSObject
-    @property(weak,nonatomic) SCLAlertView *alert;
+@interface Utility : NSObject    
     + (UIColor *) colorFromHexString:(NSString *)hexString;
     + (void) styleNaviBar;
     + (void) showCustomAlert:(UIViewController *)controller image:(UIImage *)image title:(NSString *)title subTitle:(NSString *)subTitle;
diff --git a/ShortNotes/Utility.m b/ShortNotes/Utility.m
index 8cb1b74..fa3ea00 100644
--- a/ShortNotes/Utility.m
+++ b/ShortNotes/Utility.m
@@ -14,16 +14,16 @@ @implementation Utility
 + (UIColor *)colorFromHexString:(NSString *)hexString {
     unsigned rgbValue = 0;
     NSScanner *scanner = [NSScanner scannerWithString:hexString];
-    [scanner setScanLocation:1];
+    scanner.scanLocation = 1;
     [scanner scanHexInt:&rgbValue];
     return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16)/255.0 green:((rgbValue & 0xFF00) >> 8)/255.0 blue:(rgbValue & 0xFF)/255.0 alpha:1.0];
 }
 
 + (void) styleNaviBar {
-    [[UINavigationBar appearance] setBackgroundImage:[UIImage imageNamed:naviTxt] forBarMetrics:UIBarMetricsDefault];
     NSShadow *shadow = [[NSShadow alloc] init];
     shadow.shadowColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.8];
     shadow.shadowOffset = CGSizeMake(0, 1);
+    [[UINavigationBar appearance] setBackgroundImage:[UIImage imageNamed:naviTxt] forBarMetrics:UIBarMetricsDefault];
     [[UINavigationBar appearance] setTitleTextAttributes: [NSDictionary dictionaryWithObjectsAndKeys:
                                                            [UIColor colorWithRed:245.0/255.0 green:245.0/255.0 blue:245.0/255.0 alpha:1.0], NSForegroundColorAttributeName,
                                                            shadow, NSShadowAttributeName,