diff --git a/src/components/settings/SettingEdit.js b/src/components/settings/SettingEdit.js
index b116b73..469fb4f 100644
--- a/src/components/settings/SettingEdit.js
+++ b/src/components/settings/SettingEdit.js
@@ -1,17 +1,31 @@
 import React from "react";
-import { Edit, SimpleForm, TextInput } from "react-admin";
+import {
+  Edit,
+  SimpleForm,
+  TextInput,
+  EditController,
+  EditView,
+  BooleanInput,
+} from "react-admin";
 
 const SettingEdit = (props) => (
-  <Edit label="Settings" {...props}>
-    <SimpleForm>
-      <TextInput label="Requests per Minute (max)" source="maxRequestsPerMin" />
-      <TextInput
-        disabled
-        label="Items per Page (default)"
-        source="maxItemsPerPage"
-      />
-      <TextInput label="Items per Page (max)" source="defaultItemsPerPage" />
-    </SimpleForm>
+  <Edit label="Settings" title=" " {...props}>
+    <EditController {...props}>
+      {(controllerProps) => (
+        <EditView title="Settings" {...controllerProps}>
+          <SimpleForm>
+            {controllerProps.record &&
+              Object.keys(controllerProps.record).map((key) =>
+                /true|false/.test(controllerProps.record[key]) ? (
+                  <BooleanInput key={key} source={key} />
+                ) : (
+                  <TextInput key={key} source={key} />
+                )
+              )}
+          </SimpleForm>
+        </EditView>
+      )}
+    </EditController>
   </Edit>
 );
 
diff --git a/src/components/settings/SettingShow.js b/src/components/settings/SettingShow.js
index b218ad8..dee8fdb 100644
--- a/src/components/settings/SettingShow.js
+++ b/src/components/settings/SettingShow.js
@@ -1,14 +1,34 @@
 import React from "react";
-import { Show, SimpleShowLayout, TextField } from "react-admin";
+import {
+  Show,
+  SimpleShowLayout,
+  TextField,
+  ShowController,
+  ShowView,
+  BooleanField,
+} from "react-admin";
 
-const SettingShow = (props) => (
-  <Show label="Settings" title="Settings" {...props}>
-    <SimpleShowLayout>
-      <TextField label="Requests per Minute (max)" source="maxRequestsPerMin" />
-      <TextField label="Items per Page (default)" source="maxItemsPerPage" />
-      <TextField label="Items per Page (max)" source="defaultItemsPerPage" />
-    </SimpleShowLayout>
-  </Show>
-);
+const SettingShow = (props) => {
+  return (
+    <Show title="Settings" {...props}>
+      <ShowController {...props}>
+        {(controllerProps) => (
+          <ShowView title="Settings" {...controllerProps}>
+            <SimpleShowLayout>
+              {controllerProps.record &&
+                Object.keys(controllerProps.record).map((key) =>
+                  /true|false/.test(controllerProps.record[key]) ? (
+                    <BooleanField key={key} source={key} />
+                  ) : (
+                    <TextField key={key} source={key} />
+                  )
+                )}
+            </SimpleShowLayout>
+          </ShowView>
+        )}
+      </ShowController>
+    </Show>
+  );
+};
 
 export default SettingShow;
diff --git a/src/components/settings/index.js b/src/components/settings/index.js
index fb5cbd4..5b1f4a5 100644
--- a/src/components/settings/index.js
+++ b/src/components/settings/index.js
@@ -1,8 +1,10 @@
 import SettingShow from "./SettingShow";
+import SettingEdit from "./SettingEdit";
 import SettingIcon from "@material-ui/icons/Settings";
 
 export default {
   list: SettingShow,
+  edit: SettingEdit,
   show: SettingShow,
   icon: SettingIcon,
 };