add /html tag
tidy up division between layout and included htmls