Updated UI further