Add home page and tidy up templates