Add navigation to top of page
Add navigation header, fix user info format