GUI Tweaks + Cleanup