Added form partials and error messages