Modify search form & add template