Refactored topbar structure.