search.php & more templating

Hope this doesn't screw up the last two commits...