Tweaked some models, added some views and templates