Refactoring, GUI tweaks