diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 2f68f1239..a03e99ede 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -47,21 +47,24 @@ buttonForm html = do
         view id name attrs _val _ = do
           [whamlet|
             #{html}
-            <button type=submit name=#{name} value=#{toPathPiece b} *{attrs} ##{id}>^{label b}
+            <button .btn .btn-default type=submit name=#{name} value=#{toPathPiece b} *{attrs} ##{id}>^{label b}
           |]
   
   buttonIdent <- newFormIdent
   resultWidgetMap <- forM buttonMap $ \val -> mopt (button val) ("" { fsName = Just buttonIdent }) Nothing
-  
-  let result = case (asum $ fst <$> resultWidgetMap) of
-        FormSuccess (Just x) -> FormSuccess x
-        FormSuccess Nothing  -> FormMissing
-        _other                -> FormMissing
+    
+  let result = asum $ nothing2miss <$> fst <$> Map.elems resultWidgetMap
   let viewF = (Map.!) (snd <$> resultWidgetMap)
   
-  
   return (result, viewF)
 
+nothing2miss :: FormResult (Maybe a) -> FormResult a
+nothing2miss (FormSuccess Nothing)  = FormMissing
+nothing2miss (FormSuccess (Just r)) = FormSuccess r
+nothing2miss (FormFailure msgs)     = FormFailure msgs
+nothing2miss (FormMissing)          = FormMissing
+  
+  
 ----------------------------
 -- Buttons (old version ) --
 ----------------------------