Revert "Quick GUI Fixes"

This reverts commit 2a0f1451ed691038023514c80b9274830101c877.