Template refactor example

This may make it easier to start moving the template in a sane direction. It will definitely help with the search page and we can improve them independently. On the other hand it's not much of an improvement