Integrating some of john's UI changes to the GUI