Rearrange toolbar and prevent overflow.
Prevent underlines on hovered toolbar buttons.
I accidentally broke dropdowns when I tried to prevent the toolbar from overflowing.  Reverting.
Fix trailing comma.