diff --git a/www/src/components/validated-text-input.jsx b/www/src/components/validated-text-input.jsx
index c92e67d..d163b3c 100644
--- a/www/src/components/validated-text-input.jsx
+++ b/www/src/components/validated-text-input.jsx
@@ -2,7 +2,13 @@ import { createSignal, mergeProps } from "solid-js";
 
 function ValidatedTextInput(props) {
   props = mergeProps(
-    { type: "text", valid: true, onInput: () => {}, errorText: "" },
+    {
+      type: "text",
+      valid: true,
+      onInput: () => {},
+      errorText: "",
+      placeholder: "",
+    },
     props
   );
   let [isActive, setActive] = createSignal(false);
@@ -15,6 +21,7 @@ function ValidatedTextInput(props) {
         }
         id={props.id}
         value={props.value}
+        placeholder={props.placeholder}
         onInput={props.onInput}
         onFocusOut={() => setActive(true)}
       />
diff --git a/www/src/modals/create-command-modal.jsx b/www/src/modals/create-command-modal.jsx
index 288ee49..dd15e0a 100644
--- a/www/src/modals/create-command-modal.jsx
+++ b/www/src/modals/create-command-modal.jsx
@@ -26,14 +26,6 @@ function CreateCommandModal(props) {
   const isCommandTypeValid = createMemo(() => commandType() !== "");
   const isTitleValid = createMemo(() => title().length >= MIN_TITLE_LENGTH);
 
-  createEffect(() => {
-    let commandString = commandType()
-      ? Command.CommandTypes[commandType()]
-      : "";
-    let protocolString = protocol() ? Command.Protocols[protocol()] : "";
-    setTitle(commandString + " " + protocolString);
-  });
-
   const isFormValid = createMemo(
     () =>
       isProtocolValid() &&
@@ -46,13 +38,15 @@ function CreateCommandModal(props) {
   async function handleCreateCommand() {
     let command;
     try {
-      command = await RemotesService.createCommand({
-        protocol: protocol(),
-        commandNumber: commandNumber(),
-        device: device(),
-        commandType: commandType(),
-        title: title(),
-      });
+      command = await RemotesService.createCommand(
+        new Command({
+          protocol: protocol(),
+          commandNumber: commandNumber(),
+          device: device(),
+          commandType: commandType(),
+          title: title(),
+        })
+      );
     } catch (e) {
       setError(e.message);
       return;
@@ -93,7 +87,9 @@ function CreateCommandModal(props) {
               class="form-select"
               onChange={(e) => setProtocol(e.target.value)}
             >
-              <option value="" selected>Please select</option>
+              <option value="" selected>
+                Please select
+              </option>
               {Object.keys(Command.Protocols).map((protocol) => (
                 <option value={protocol}>{Command.Protocols[protocol]}</option>
               ))}
@@ -138,7 +134,9 @@ function CreateCommandModal(props) {
               class="form-select"
               onChange={(e) => setCommandType(e.target.value)}
             >
-              <option value="" selected>Please select</option>
+              <option value="" selected>
+                Please select
+              </option>
               {Object.keys(Command.CommandTypes).map((commandType) => (
                 <option value={commandType}>
                   {Command.CommandTypes[commandType]}
diff --git a/www/src/modals/create-remote-modal.jsx b/www/src/modals/create-remote-modal.jsx
index cbdee86..60824c7 100644
--- a/www/src/modals/create-remote-modal.jsx
+++ b/www/src/modals/create-remote-modal.jsx
@@ -5,6 +5,7 @@ import EventEmitter from "../tools/event-emitter.js";
 import ModalHandler from "./modal-handler.js";
 import Modal from "./modal.jsx";
 import ListManager from "../components/list-manager.jsx";
+import Remote from "../data/remote.js";
 
 const eventEmitter = new EventEmitter();
 const REMOTE_CREATED_EVENT = "success";
@@ -28,10 +29,12 @@ function CreateRemoteModal(props) {
   async function handleCreateRemote() {
     let remote;
     try {
-      remote = await RemotesService.createRemote({
-        title: title(),
-        commands: commands(),
-      });
+      remote = await RemotesService.createRemote(
+        new Remote({
+          title: title(),
+          commands: commands(),
+        })
+      );
     } catch (e) {
       setError(e.message);
       return;
diff --git a/www/src/services/remotes-service.js b/www/src/services/remotes-service.js
index 6712f5a..e0b2a09 100644
--- a/www/src/services/remotes-service.js
+++ b/www/src/services/remotes-service.js
@@ -34,8 +34,7 @@ function RemotesService() {
     return [].concat(remotes);
   }
 
-  async function createRemote(remoteObject) {
-    let remote = Serializer.deserializeRemote(remoteObject);
+  async function createRemote(remote) {
     let id = Math.random().toString(36).substr(2, 9);
     remote.setId(id);
     remotes.push(remote);
@@ -53,8 +52,7 @@ function RemotesService() {
     return [].concat(_commands);
   }
 
-  async function createCommand(commandObject) {
-    let command = Serializer.deserializeCommand(commandObject);
+  async function createCommand(command) {
     let id = Math.random().toString(36).substr(2, 9);
     command.setId(id);
     _commands.push(command);