Some GUI Cleanup + Small Fixes