Begin of refactoring
Changes GUI Handling