Updated UI for minor glitches