Top bar and layout tweaks