update ui
Merge branch 'master' of http://www.project-moonshot.org/git/moonshot