cleaned up form
Merge branch 'dev'