First Pass for new UI changes