Minor GUI Fixes