Improved buttons in nav, and nav layout