added topbar/nav clean up