Updated UI and structure