-body in templates
-fix width
Merge remote-tracking branch 'origin/master'