Added search form & comment field.