Gui cleanup

Did a lot of cleanup to the GUI