Refactored  form
Merge branch 'master' into sdeprez/footer
Footer updated