Added a few more classes. Enhanced the GUI

Enhanced GUI