Fix and clean up public views for the new UI