Minor changes to implement some suggestions from Bretts ui review notes