Some refactoring and work on the gui