Template fixes

See the changes on heroku http://kopentavern.herokuapp.com/
Can you write a test to demonstrate the failure condition? I have never seen this happen.