from Goto to Master Branch

Modified Layout and NavBar