Merge branch 'hotfix/0.2.17'

* hotfix/0.2.17:
  fix toggler
move email styles to partial
clean up controller a little
Merge branch 'hotfix/0.3.0' into develop

* hotfix/0.3.0:
  clean up controller a little
  move email styles to partial