Added templates and customised search box.  Some misc fixes.