Settings button to navigation bar

Moved settings button to right hand side of the navigation bar.