added all boundaries, some changes in html template