diff --git a/app/library/Form.php b/app/library/Form.php
index 89fe06e..978c904 100644
--- a/app/library/Form.php
+++ b/app/library/Form.php
@@ -37,16 +37,16 @@ class Form extends FormBase
             unset($opt['length']);
         }
 
-        if ($ele->hasMessages()) {
-            $options['class'][] = 'has-error';
-            $options['message'] = $ele->getMessages()->current();
-        }
-
         return $this->_render($ele, $options);
     }
 
     protected function _render(AbstractElement $ele, $opt)
     {
+		$classes = ['class' => 'form-control'];
+		if ($ele->hasMessages()) {
+			$classes['class'] .= ' is-invalid';
+		}
+
         $xhtml = '';
 
         if (strlen($ele->getLabel()) > 0) {
@@ -57,10 +57,11 @@ class Form extends FormBase
         }
 
         $xhtml .= '<div class="' . implode(' ', $opt['class']) . '">'
-            . $ele->render();
+            . $ele->render($classes);
 
-        if (strlen($opt['message']) > 0)  {
-            $xhtml .= '<span class="help-block">' . $opt['message'] . '</span>';
+        if ($ele->hasMessages()) {
+			$msg = $ele->getMessages()->current();
+            $xhtml .= '<span class="invalid-feedback">' . $msg . '</span>';
         }
 
         $xhtml .= '</div>';