Some GUI Improvements