Updates to UI other bits and pieces