Further fixes to buttons, additions to the navigation styles