reorganize templates. hook up some more pages.