GUI refactorin