Add a navigation bar and clean up user-page