new ui not checked in
Merge pull request #156 from continuuity/feature/fix-ui-release0.9.7

new ui not checked in