updated some views and templates