template and views changes