refactoring navigation UI and home