diff --git a/gulp/tasks/serve.js b/gulp/tasks/serve.js
new file mode 100644
index 0000000..ae739d3
--- /dev/null
+++ b/gulp/tasks/serve.js
@@ -0,0 +1,12 @@
+var gulp = require('gulp'),
+  webserver = require('gulp-webserver');
+
+gulp.task('serve', function() {
+  gulp.src('.')
+    .pipe(webserver({
+      livereload: true,
+      directoryListing: true,
+      open: true
+    }));
+});
+
diff --git a/package.json b/package.json
index f6c427d..1c531ff 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "gulp-uglify": "^1.2.0",
     "gulp-umd": "^0.2.0",
     "gulp-watch": "^4.2.4",
+    "gulp-webserver": "^0.9.1",
     "streamqueue": "^0.1.3"
   }
 }
diff --git a/src/default.html b/src/default.html
index b2b2184..a7a2546 100644
--- a/src/default.html
+++ b/src/default.html
@@ -1,5 +1,5 @@
-<div class="form-group schema-form-{{form.type}} {{form.htmlClass}}"
-     ng-class="{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false }">
+<div class="form-group {{form.htmlClass}}"
+     ng-class="{ '{{'schema-form-' + form.type}}': true, 'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false }">
   <label class="control-label {{form.labelHtmlClass}}" ng-class="{'sr-only': !showTitle()}" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label>
 
   <input ng-if="!form.fieldAddonLeft && !form.fieldAddonRight"