Cleaned up GUI and fixed spinners