More Navigation + Misc + Better Buttons

More Navigation + Misc + Better Buttons