minor template work [5]
Merge branch 'bootstrap' into comments_work
minor changes in template