Please do not go off the master
Improved the GUI more