combine app + common topbar, remove unused classes