refining templates and views
resolved merge conflicts