Add more work to the new UI for life-preserver