Fix topbar, status and navigation
Fix conflicts in topbar and styles_2