styling
layout
message styling
merge
Merge branch 'master' into ajax_1