Moved all progress made to the GUI from menurewrite into master and re-integrated it, somehow drawing broke during this process