More tweaks and fixes

 - Re-arrange menu bar
 - Fix up table row highlighting
 - Change orange buttons to red buttons