Updates to support new UI features.