Added some more fields to db; modified some templates