Cleaned up the rest of the gui.controlwindow