added more navigational UI and refactored more.