topbar layout tweaks.
Cleanup.