more stubbing of ui elements
Merge branch 'master' into gh-pages