merge with site
views was fixed