Slight GUI refactoring, started to extract model bean