diff --git a/IHP/IDE/Data/Controller.hs b/IHP/IDE/Data/Controller.hs
index 4285a9690..c39094b97 100644
--- a/IHP/IDE/Data/Controller.hs
+++ b/IHP/IDE/Data/Controller.hs
@@ -73,7 +73,7 @@ instance Controller DataController where
         tableNames <- fetchTableNames connection
         let tableName = param "tableName"
         tableCols <- fetchTableCols connection tableName
-        let values :: [Text] = map (\col -> quoteIfLiteral (param @Bool (cs (get #columnName col) <> "_")) (param @Text (cs (get #columnName col)))) tableCols
+        let values :: [Text] = map (\col -> parseValues (param @Bool (cs (get #columnName col) <> "_")) (param @Bool (cs (get #columnName col) <> "-isBoolean")) (param @Text (cs (get #columnName col)))) tableCols
         let query = "INSERT INTO " <> tableName <> " VALUES (" <> intercalate "," values <> ")"
         PG.execute_ connection (PG.Query . cs $! query)
         PG.close connection
@@ -100,7 +100,7 @@ instance Controller DataController where
         tableCols <- fetchTableCols connection tableName
         primaryKeyFields <- tablePrimaryKeyFields connection tableName
 
-        let values :: [Text] = map (\col -> quoteIfLiteral (param @Bool (cs (get #columnName col) <> "_")) (param @Text (cs (get #columnName col)))) tableCols
+        let values :: [Text] = map (\col -> parseValues (param @Bool (cs (get #columnName col) <> "_")) (param @Bool (cs (get #columnName col) <> "-isBoolean")) (param @Text (cs (get #columnName col)))) tableCols
         let columns :: [Text] = map (\col -> cs (get #columnName col)) tableCols
         let primaryKeyValues = map (\pkey -> "'" <> (param @Text (cs pkey <> "-pk")) <> "'") primaryKeyFields
 
@@ -139,7 +139,7 @@ instance Controller DataController where
         connection <- connectToAppDb
         let targetCol = param "targetName"
         let targetValue = param "targetValue"
-        let query = "UPDATE " <> tableName <> " SET " <> targetCol <> " = '" <> targetValue <> "' WHERE id = " <> cs id
+        let query = "UPDATE " <> tableName <> " SET " <> targetCol <> " = '" <> targetValue <> "' WHERE id = '" <> cs id <> "'"
         PG.execute_ connection (PG.Query . cs $! query)
         PG.close connection
         redirectTo ShowTableRowsAction { .. }
@@ -185,8 +185,13 @@ fetchRows connection tableName = do
 
     PG.query_ connection (PG.Query . cs $! query)
 
-quoteIfLiteral :: Bool -> Text -> Text
-quoteIfLiteral False text = "'" <> text <> "'"
-quoteIfLiteral True text = text
+-- parseValues sqlMode isBoolField input
+parseValues :: Bool -> Bool -> Text -> Text
+parseValues _ True "on" = "true"
+parseValues _ True "off" = "false"
+parseValues False False text = "'" <> text <> "'"
+parseValues True False text = text
+parseValues False True text = text
+parseValues True True text = text
 
 updateValues list = map (\elem -> fst elem <> " = " <> snd elem) list
diff --git a/IHP/IDE/Data/View/EditRow.hs b/IHP/IDE/Data/View/EditRow.hs
index 02e52b252..7155059a8 100644
--- a/IHP/IDE/Data/View/EditRow.hs
+++ b/IHP/IDE/Data/View/EditRow.hs
@@ -72,25 +72,127 @@ instance View EditRowView ViewContext where
                         </span>
 
                         <div class="input-group">
+                            {renderInputMethod (def, val)}
+                        </div>
+                    </div>|]
+
+            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
+            renderInputMethod :: (ColumnDefinition, DynamicField) -> Html
+            renderInputMethod (def, val) | (get #columnType def) == "boolean" && isNothing (get #fieldValue val) = [hsx|
+                            {isBooleanParam True def}
+                            <input
+                                id={get #columnName def <> "-alt"}
+                                type="text"
+                                name={get #columnName def}
+                                class="form-control text-monospace text-secondary bg-light"
+                                value="NULL"
+                                />
+                            <div class="form-control" id={get #columnName def <> "-boxcontainer"}>
+                                <input
+                                    id={get #columnName def <> "-input"}
+                                    type="checkbox"
+                                    class="d-none"
+                                    name={get #columnName def <> "-inactive"}
+                                    checked={(value val) == "t"}
+                                    />
+                            </div>
+                            <input
+                                id={get #columnName def <> "-hidden"}
+                                type="hidden"
+                                name={get #columnName def}
+                                value={inputValue False}
+                                />
+                            <div class="input-group-append">
+                                <button class="btn dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+                                <div class="dropdown-menu dropdown-menu-right custom-menu menu-for-column shadow backdrop-blur">
+                                    <a class="dropdown-item" data-value="DEFAULT" data-issql="True" onclick={fillField def "DEFAULT" "true"}>DEFAULT</a>
+                                    <a class="dropdown-item" data-value="NULL" data-issql="True" onclick={fillField def "NULL" "true"}>NULL</a>
+                                    <a class="dropdown-item">
+                                        <input
+                                            id={get #columnName def <> "-sqlbox"}
+                                            type="checkbox"
+                                            name={get #columnName def <> "_"}
+                                            checked={True}
+                                            class="mr-1"
+                                            onclick={"sqlModeCheckbox('" <> get #columnName def <> "', this, true)"}
+                                            />
+                                        <label class="form-check-label" for={get #columnName def <> "-sqlbox"}> Parse as SQL</label>
+                                    </a>
+                                    <input
+                                        type="hidden"
+                                        name={get #columnName def <> "_"}
+                                        value={inputValue False}
+                                        />
+                                </div>
+                            </div>
+                                |]
+            renderInputMethod (def, val) | (get #columnType def) == "boolean" = [hsx|
+                            {isBooleanParam True def}
+                            <input
+                                id={get #columnName def <> "-alt"}
+                                type="text"
+                                name={get #columnName def <> "-inactive"}
+                                class="form-control text-monospace text-secondary bg-light d-none"
+                                />
+                            <div class="form-control" id={get #columnName def <> "-boxcontainer"}>
+                                <input
+                                    id={get #columnName def <> "-input"}
+                                    type="checkbox"
+                                    name={get #columnName def}
+                                    checked={(value val) == "t"}
+                                    />
+                            </div>
+                            <input
+                                id={get #columnName def <> "-hidden"}
+                                type="hidden"
+                                name={get #columnName def}
+                                value={inputValue False}
+                                />
+                            <div class="input-group-append">
+                                <button class="btn dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+                                <div class="dropdown-menu dropdown-menu-right custom-menu menu-for-column shadow backdrop-blur">
+                                    <a class="dropdown-item" data-value="DEFAULT" data-issql="True" onclick={fillField def "DEFAULT" "true"}>DEFAULT</a>
+                                    <a class="dropdown-item" data-value="NULL" data-issql="True" onclick={fillField def "NULL" "true"}>NULL</a>
+                                    <a class="dropdown-item">
+                                        <input
+                                            id={get #columnName def <> "-sqlbox"}
+                                            type="checkbox"
+                                            name={get #columnName def <> "_"}
+                                            checked={isSqlFunction (getColDefaultValue def)}
+                                            class="mr-1"
+                                            onclick={"sqlModeCheckbox('" <> get #columnName def <> "', this, true)"}
+                                            />
+                                        <label class="form-check-label" for={get #columnName def <> "-sqlbox"}> Parse as SQL</label>
+                                    </a>
+                                    <input
+                                        type="hidden"
+                                        name={get #columnName def <> "_"}
+                                        value={inputValue False}
+                                        />
+                                </div>
+                            </div>
+                                |]
+            renderInputMethod (def, val) = [hsx|
+                            {isBooleanParam False def}
                             <input
                                 id={get #columnName def <> "-input"}
                                 type="text"
                                 name={get #columnName def}
-                                class={classes ["form-control", ("text-monospace text-secondary bg-light", isSqlFunction_ value)]}
-                                value={value}
+                                class={classes ["form-control", ("text-monospace text-secondary bg-light", isSqlFunction_ (value val))]}
+                                value={value val}
                                 oninput={"stopSqlModeOnInput('" <> get #columnName def <> "')"}
                                 />
                             <div class="input-group-append">
                                 <button class="btn dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
                                 <div class="dropdown-menu dropdown-menu-right custom-menu menu-for-column shadow backdrop-blur">
-                                    <a class="dropdown-item" data-value="DEFAULT" data-issql="True" onclick={fillField def "DEFAULT"}>DEFAULT</a>
-                                    <a class="dropdown-item" data-value="NULL" data-issql="True" onclick={fillField def "NULL"}>NULL</a>
+                                    <a class="dropdown-item" data-value="DEFAULT" data-issql="True" onclick={fillField def "DEFAULT" "false"}>DEFAULT</a>
+                                    <a class="dropdown-item" data-value="NULL" data-issql="True" onclick={fillField def "NULL" "false"}>NULL</a>
                                     <a class="dropdown-item">
                                         <input
                                             id={get #columnName def <> "-sqlbox"}
                                             type="checkbox"
                                             name={get #columnName def <> "_"}
-                                            checked={isSqlFunction_ value}
+                                            checked={isSqlFunction_ (value val)}
                                             class="mr-1"
                                             onclick={"sqlModeCheckbox('" <> get #columnName def <> "', this)"}
                                             />
@@ -102,10 +204,6 @@ instance View EditRowView ViewContext where
                                         value={inputValue False}
                                         />
                                 </div>
-                            </div>
-                        </div>
-                    </div>|]
-                where
-                    value = fromMaybe BS.empty (get #fieldValue val)
+                            </div>|]
 
-            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
+value val = fromMaybe BS.empty (get #fieldValue val)
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/EditValue.hs b/IHP/IDE/Data/View/EditValue.hs
index 96863f8ed..74d3791f1 100644
--- a/IHP/IDE/Data/View/EditValue.hs
+++ b/IHP/IDE/Data/View/EditValue.hs
@@ -37,7 +37,7 @@ instance View EditValueView ViewContext where
         where
 
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
-            renderRow fields = [hsx|<tr oncontextmenu={"showContextMenu('" <> contextMenuId <> "');"}>{forEach fields (renderField id fields)}
+            renderRow fields = [hsx|<tr oncontextmenu={"showContextMenu('" <> contextMenuId <> "');"}>{forEach fields (renderField id)}
             </tr>
             <div class="custom-menu menu-for-column shadow backdrop-blur" id={contextMenuId}>
                 <a href={EditRowAction tableName id}>Edit Row</a>
@@ -49,16 +49,15 @@ instance View EditValueView ViewContext where
                     contextMenuId = "context-menu-column-" <> tshow id
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
 
-            renderField id fields DynamicField { .. } = if (tshow targetName) == (tshow fieldName) && targetId == id
-                then [hsx|<td>
+            renderField id DynamicField { .. } | (tshow targetName) == (tshow fieldName) && targetId == id = [hsx|<td>
                 <form id="fieldForm" method="POST" action={UpdateValueAction}>
                     <input id="editField" autofocus="autofocus" type="text" name="targetValue" value={fromMaybe "" fieldValue}/>
-                    {forEach fields renderValue}
                     <input id="inputField" type="hidden" name="tableName" value={tableName}/>
+                    <input type="hidden" name="id" value={id}/>
                     <input type="hidden" name="targetName" value={targetName}/>
                 </form></td>|]
-                else [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
-            renderValue DynamicField { .. } = [hsx|<input type="hidden" name={fieldName} value={renderRowValue fieldValue}/>|]
+            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (sqlValueToText fieldValue)}</a></span></td>|]
+            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
             script = preEscapedToHtml [plain|
                 <script>
                     onClickHandler = () => {
diff --git a/IHP/IDE/Data/View/Layout.hs b/IHP/IDE/Data/View/Layout.hs
index ced932b71..6828f198d 100644
--- a/IHP/IDE/Data/View/Layout.hs
+++ b/IHP/IDE/Data/View/Layout.hs
@@ -1,9 +1,26 @@
-module IHP.IDE.Data.View.Layout (customQuery, tableHead, renderColumnHead, columnNames, renderRows, sqlValueToText, renderId, isBoolField, isSqlFunction, isSqlFunction_, fillField, getColDefaultValue, renderRowValue) where
+module IHP.IDE.Data.View.Layout
+    ( customQuery
+    , tableHead
+    , renderColumnHead
+    , columnNames
+    , renderRows
+    , sqlValueToText
+    , renderId
+    , isBoolField
+    , isSqlFunction
+    , isSqlFunction_
+    , fillField
+    , getColDefaultValue
+    , renderRowValue
+    , renderDefaultWithoutType
+    , isBooleanParam
+    ) where
 
 import IHP.ViewPrelude
 import IHP.IDE.SchemaDesigner.Types hiding (columnNames)
 import IHP.IDE.ToolServer.Types
 import IHP.IDE.ToolServer.Layout
+import qualified Data.Text as Text
 
 customQuery :: Text -> Html
 customQuery input = [hsx|<div class="p-2 rounded mt-2" style="background-color: #002B36;"><div id="queryInput" style="height:16px">{input}</div></div>|]
@@ -44,7 +61,7 @@ isSqlFunction_ text = text `elem`
     , "NOW()"
     , "NULL"]
 
-fillField col value = "fillField('" <> get #columnName col <> "', '" <> value <> "');"
+fillField col value isBoolField = "fillField('" <> get #columnName col <> "', '" <> value <> "'," <> isBoolField <> ");"
 
 getColDefaultValue :: ColumnDefinition -> Text
 getColDefaultValue ColumnDefinition { columnDefault, isNullable } = case columnDefault of
@@ -55,4 +72,19 @@ getColDefaultValue ColumnDefinition { columnDefault, isNullable } = case columnD
 
 renderRowValue :: Maybe ByteString -> Text
 renderRowValue (Just value) = "'" <> cs value <> "'"
-renderRowValue Nothing = "NULL" 
\ No newline at end of file
+renderRowValue Nothing = "NULL" 
+
+renderDefaultWithoutType :: Text -> Text
+renderDefaultWithoutType "" = ""
+renderDefaultWithoutType input = case length (Text.splitOn "'" input) of
+        3 -> (Text.splitOn "'" input) !! 1
+        _ -> input
+
+isBooleanParam :: Bool -> ColumnDefinition -> Html
+isBooleanParam isBool def = [hsx|
+<input
+    type="hidden"
+    name={get #columnName def <> "-isBoolean"}
+    value={inputValue isBool}
+    />
+|]
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/NewRow.hs b/IHP/IDE/Data/View/NewRow.hs
index d74b25ae9..77c85a1d0 100644
--- a/IHP/IDE/Data/View/NewRow.hs
+++ b/IHP/IDE/Data/View/NewRow.hs
@@ -62,19 +62,73 @@ instance View NewRowView ViewContext where
                         </span>
 
                         <div class="input-group">
+                            {renderInputMethod col}
+                        </div>
+                    </div>|]
+
+            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
+            renderInputMethod :: ColumnDefinition -> Html 
+            renderInputMethod col | (get #columnType col) == "boolean" = [hsx|
+                            {isBooleanParam True col}
+                            <input
+                                id={get #columnName col <> "-alt"}
+                                type="text"
+                                name={get #columnName col <> "-inactive"}
+                                class="form-control text-monospace text-secondary bg-light d-none"
+                                />
+                            <div class="form-control" id={get #columnName col <> "-boxcontainer"}>
+                                <input
+                                    id={get #columnName col <> "-input"}
+                                    type="checkbox"
+                                    name={get #columnName col}
+                                    checked={get #columnDefault col == Just "true"}
+                                    />
+                            </div>
+                            <input
+                                id={get #columnName col <> "-hidden"}
+                                type="hidden"
+                                name={get #columnName col}
+                                value={inputValue False}
+                                />
+                            <div class="input-group-append">
+                                <button class="btn dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+                                <div class="dropdown-menu dropdown-menu-right custom-menu menu-for-column shadow backdrop-blur">
+                                    <a class="dropdown-item" data-value="DEFAULT" data-issql="True" onclick={fillField col "DEFAULT" "true"}>DEFAULT</a>
+                                    <a class="dropdown-item" data-value="NULL" data-issql="True" onclick={fillField col "NULL" "true"}>NULL</a>
+                                    <a class="dropdown-item">
+                                        <input
+                                            id={get #columnName col <> "-sqlbox"}
+                                            type="checkbox"
+                                            name={get #columnName col <> "_"}
+                                            checked={isSqlFunction (getColDefaultValue col)}
+                                            class="mr-1"
+                                            onclick={"sqlModeCheckbox('" <> get #columnName col <> "', this, true)"}
+                                            />
+                                        <label class="form-check-label" for={get #columnName col <> "-sqlbox"}> Parse as SQL</label>
+                                    </a>
+                                    <input
+                                        type="hidden"
+                                        name={get #columnName col <> "_"}
+                                        value={inputValue False}
+                                        />
+                                </div>
+                            </div>
+                                |]
+            renderInputMethod col = [hsx|
+                            {isBooleanParam False col}
                             <input
                                 id={get #columnName col <> "-input"}
                                 type="text"
                                 name={get #columnName col}
                                 class={classes ["form-control", ("text-monospace text-secondary bg-light", isSqlFunction (getColDefaultValue col))]}
-                                value={getColDefaultValue col}
+                                value={renderDefaultWithoutType (getColDefaultValue col)}
                                 oninput={"stopSqlModeOnInput('" <> get #columnName col <> "')"}
                                 />
                             <div class="input-group-append">
                                 <button class="btn dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
                                 <div class="dropdown-menu dropdown-menu-right custom-menu menu-for-column shadow backdrop-blur">
-                                    <a class="dropdown-item" data-value="DEFAULT" data-issql="True" onclick={fillField col "DEFAULT"}>DEFAULT</a>
-                                    <a class="dropdown-item" data-value="NULL" data-issql="True" onclick={fillField col "NULL"}>NULL</a>
+                                    <a class="dropdown-item" data-value="DEFAULT" data-issql="True" onclick={fillField col "DEFAULT" "false"}>DEFAULT</a>
+                                    <a class="dropdown-item" data-value="NULL" data-issql="True" onclick={fillField col "NULL" "false"}>NULL</a>
                                     <a class="dropdown-item">
                                         <input
                                             id={get #columnName col <> "-sqlbox"}
@@ -82,7 +136,7 @@ instance View NewRowView ViewContext where
                                             name={get #columnName col <> "_"}
                                             checked={isSqlFunction (getColDefaultValue col)}
                                             class="mr-1"
-                                            onclick={"sqlModeCheckbox('" <> get #columnName col <> "', this)"}
+                                            onclick={"sqlModeCheckbox('" <> get #columnName col <> "', this, false)"}
                                             />
                                         <label class="form-check-label" for={get #columnName col <> "-sqlbox"}> Parse as SQL</label>
                                     </a>
@@ -92,8 +146,4 @@ instance View NewRowView ViewContext where
                                         value={inputValue False}
                                         />
                                 </div>
-                            </div>
-                        </div>
-                    </div>|]
-
-            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
\ No newline at end of file
+                            </div>|]
\ No newline at end of file
diff --git a/IHP/View/Modal.hs b/IHP/View/Modal.hs
index 16c5924eb..80ebc9ccc 100644
--- a/IHP/View/Modal.hs
+++ b/IHP/View/Modal.hs
@@ -18,7 +18,7 @@ renderModal Modal { modalContent, modalFooter, modalCloseUrl, modalTitle } show
     |]
         where
             modalClassName :: Text
-            modalClassName = "modal fade " <> if show then "show" else ""
+            modalClassName = "modal fade overflow-auto " <> if show then "show" else ""
             backdropClassName :: Text
             backdropClassName = "modal-backdrop fade " <> if show then "show" else ""
             displayStyle :: Text
diff --git a/lib/IHP/static/ihp-schemadesigner.js b/lib/IHP/static/ihp-schemadesigner.js
index 5a2d8d8eb..8309fa9b8 100644
--- a/lib/IHP/static/ihp-schemadesigner.js
+++ b/lib/IHP/static/ihp-schemadesigner.js
@@ -199,16 +199,25 @@ function initQueryAce() {
 }
 
 
-function fillField(id, value) {
-    var inputField = document.getElementById(id + "-input");
+function fillField(id, value, isBoolean) {
+    if (isBoolean) {
+        setCheckboxSqlMode(id, true)
+        var inputField = document.getElementById(id + "-alt");
+    } else {
+        setSqlMode(id, true);
+        var inputField = document.getElementById(id + "-input");
+    }
     var sqlModeBox = document.getElementById(id + "-sqlbox");
     inputField.value = value;
     sqlModeBox.checked = true;
-    setSqlMode(id, true);
 }
 
-function sqlModeCheckbox(id, checkbox) {
-    setSqlMode(id, checkbox.checked);
+function sqlModeCheckbox(id, checkbox, isBoolean) {
+    if (isBoolean) {
+        setCheckboxSqlMode(id, checkbox.checked)
+    } else {
+        setSqlMode(id, checkbox.checked);
+    }
 }
 
 function setSqlMode(id, sqlMode) {
@@ -224,4 +233,27 @@ function stopSqlModeOnInput(id) {
     var sqlModeBox = document.getElementById(id + "-sqlbox");
     sqlModeBox.checked = false;
     setSqlMode(id, false);
+}
+
+function setCheckboxSqlMode(id, sqlMode) {
+    var inputField = document.getElementById(id + "-input");
+    var hiddenField = document.getElementById(id + "-hidden");
+    var checkBoxContainer = document.getElementById(id + "-boxcontainer");
+    var altField = document.getElementById(id + "-alt");
+    if (sqlMode) {
+        inputField.className = "d-none";
+        inputField.name = id + "-inactive";
+        hiddenField.name = id + "-inactive";
+        altField.className = "form-control text-monospace text-secondary bg-light";
+        altField.name = id;
+        checkBoxContainer.className = "d-none";
+        
+    } else {
+        inputField.className = "";
+        inputField.name = id;
+        hiddenField.name = id;
+        altField.className = "d-none";
+        altField.name = id + "-inactive";
+        checkBoxContainer.className = "form-control";
+    }
 }
\ No newline at end of file