Ui changes

merge Dave's work into master