Refactor, UI verbessert