ui updates
Merge pull request #823 from tonyrd/development

ui updates