Class clean-up and improved GUI

Deleted unnecessary classes and changed spacing for GUI elements.