GUI Fix