Fixed position of items in the GUI and removed old comments