Small improvements for GUI Redesign