Finalized the 3 navigation tabs together with proper name-refactoring