Cleaned up and finished menus and page navigation. The cleanup was a bit invasive, but I think there will be a little cleaner border color inheritance for the buttons.