Topbar button size smaller
Aded better support for multiple modes.