More toolbar/layout tweaks