Finished moving the buttons from that bottom toolbar in to either the top toolbar or the File menu.
Merge branch 'john_dev'