Refactor a few more frontend details
Merge branch 'master' into yeoman