Added user navigation to main screen.
Factored helpers