Removed unnecessary input tags, fixed custom provider to not use class by default.