Slight UI changes while reordering the Toolbar/Menu code.