Cleaning up resizing
Form switching
Merge branch 'master' into meteor

Importing changes