Add nav bar buttons for screen navigation, and visual polish