Updated the topbar to work correctly.