Improved the GUI slightly and made some refactoring changes
Refactoring