Adding support to change sim from form
Merge branch 'master' into gh-pages
Forms working