codeformatting
added a few divs -- element // element-wrapper
removed unwanted element-wrapper etc.
minor IDE related
added two fields that are used elsewhere
wrapping message in p tag
fixed failing test
Merge branch 'feature/1455_favourites' into develop