Working on GUI
Refactoring