Template fixes

See the changes on heroku http://kopentavern.herokuapp.com/