Moved fields to separate template.
Added search form.