Cleaned up GUI modifications