fixed templates and linked some pages