Cleaned and unified activity and menubar behavior.