settings page clean up and added navigation bars