fixed storyboard inconsistency
improved tracking of the current user location

(using the built in methods instead of doing it manually)