Updated Buttons and Navigation