cleaned up search templates, added nav