Updated UI even more