Little GUI Fixes