Updated UI based on Beta feedback