Moved the params around to put the title before the message
Merge branch 'feature/params-structure' into develop

* feature/params-structure:
  Moved the params around to put the title before the message