Bug fixes and nav buttons in middle of screen