Doing some minor refactoring
First version of the GUI