Changing context controls to reflect new UI direction