diff --git a/VAR.Focus.Web/Pages/FormUtils.cs b/VAR.Focus.Web/Pages/FormUtils.cs
index 4b3e627..878dfbd 100644
--- a/VAR.Focus.Web/Pages/FormUtils.cs
+++ b/VAR.Focus.Web/Pages/FormUtils.cs
@@ -6,10 +6,13 @@ namespace VAR.Focus.Web.Pages
 {
     public class FormUtils
     {
-        public static Control CreatePanel(Control ctrl, string cssClass)
+        public static Control CreatePanel(string cssClass, Control ctrl)
         {
             Panel pnl = new Panel();
-            pnl.Controls.Add(ctrl);
+            if (ctrl != null)
+            {
+                pnl.Controls.Add(ctrl);
+            }
             if (string.IsNullOrEmpty(cssClass) == false)
             {
                 pnl.CssClass = cssClass;
@@ -17,9 +20,9 @@ namespace VAR.Focus.Web.Pages
             return pnl;
         }
 
-        public static Control CreatePanel(Control ctrl)
+        public static Control CreatePanel(string cssClass)
         {
-            return CreatePanel(ctrl, null);
+            return CreatePanel(cssClass, null);
         }
 
         public static Control CreateField(string label, Control fieldControl)
diff --git a/VAR.Focus.Web/Pages/FrmBoard.cs b/VAR.Focus.Web/Pages/FrmBoard.cs
index 1b94817..8f27fdc 100644
--- a/VAR.Focus.Web/Pages/FrmBoard.cs
+++ b/VAR.Focus.Web/Pages/FrmBoard.cs
@@ -92,8 +92,9 @@ namespace VAR.Focus.Web.Pages
                 Text = board.Description.Replace(" ", "&nbsp;").Replace("\n", "<br>"),
                 CssClass = "description",
             };
-            pnlBoardSelector.Controls.Add(FormUtils.CreatePanel(lblDescription, ""));
+            pnlBoardSelector.Controls.Add(FormUtils.CreatePanel("", lblDescription));
 
+            Panel pnlButtons = (Panel)FormUtils.CreatePanel("formRow");
             var btnEdit = new CButton
             {
                 ID = string.Format("btnEdit{0}", board.IDBoard),
@@ -101,7 +102,8 @@ namespace VAR.Focus.Web.Pages
             };
             btnEdit.CommandArgument = Convert.ToString(board.IDBoard);
             btnEdit.Click += BtnEdit_Click;
-            pnlBoardSelector.Controls.Add(FormUtils.CreatePanel(btnEdit, "formRow"));
+            pnlButtons.Controls.Add(btnEdit);
+            pnlBoardSelector.Controls.Add(pnlButtons);
 
             return pnlBoardSelector;
         }
@@ -121,11 +123,11 @@ namespace VAR.Focus.Web.Pages
             var pnlBoardAdd = new Panel { CssClass = "boardBanner" };
             var btnAddBoard = new CButton { ID = "btnAddBoard", Text = "AddBoard" };
             btnAddBoard.Click += btnAddBoard_Click;
-            pnlBoardAdd.Controls.Add(FormUtils.CreatePanel(_txtTitle, "formRow"));
+            pnlBoardAdd.Controls.Add(FormUtils.CreatePanel("formRow", _txtTitle));
             _txtTitle.PlaceHolder = "Title";
-            pnlBoardAdd.Controls.Add(FormUtils.CreatePanel(_txtDescription, "formRow"));
+            pnlBoardAdd.Controls.Add(FormUtils.CreatePanel("formRow", _txtDescription));
             _txtDescription.PlaceHolder = "Description";
-            pnlBoardAdd.Controls.Add(FormUtils.CreatePanel(btnAddBoard, "formRow"));
+            pnlBoardAdd.Controls.Add(FormUtils.CreatePanel("formRow", btnAddBoard));
             Controls.Add(pnlBoardAdd);
 
         }