Corrected all classes to be public. Minor changes to Gui