refactoring navigation etc.
authentication tested with phone