some old form labels updated
more label fixes
Merge branch 'master' of github.com:spanner/droom