FrontEnd Refactoring and Nav bar additions