diff --git a/template/index.html b/template/index.html
index 6b7109e..f22027b 100644
--- a/template/index.html
+++ b/template/index.html
@@ -124,37 +124,52 @@
                             <button class="btn btn-block btn-outline-secondary mt-3" type="button">Add</button>
                         </div>
                         <div v-else-if="settings=='manage'">
-                            <div v-for="folder in foldersWithFeeds">
-                                <p><strong>{{ folder.title || "Uncategorized" }}</strong></p>
-                                <div v-for="feed in folder.feeds">
-                                    {{ feed.title }}
-
-                                    <div class="dropdown d-inline-block">
-                                        <button class="btn btn-link dropdown-toggle" @click="settingsManageDropdown='feed:'+feed.id">
-                                            <img src="./static/images/folder.svg">
-                                        </button>
-                                        <div class="dropdown-menu show py-0 overflow-hidden"
-                                             style="top: 0; left: 0; position: absolute; transform: translate3d(0px, 38px, 0px);"
-                                             v-if="settingsManageDropdown=='feed:'+feed.id">
-                                            <a href="#" class="dropdown-item px-3"
-                                               @click.prevent="moveFeed(feed, null)" v-if="feed.folder_id">---</a>
-                                            <a href="#" class="dropdown-item px-3"
-                                               v-if="folder.id != feed.folder_id"
-                                               v-for="folder in folders"
-                                               @click.prevent="moveFeed(feed, folder)">
-                                                {{ folder.title }}
-                                            </a>
+                            <div v-for="folder in foldersWithFeeds" class="mb-4">
+                                <div><strong>{{ folder.title || "Uncategorized" }}</strong></div>
+                                <div v-for="feed in folder.feeds" class="d-flex align-items-center">
+                                    <div class="w-100">
+                                        <div class="input-group input-group-sm" v-if="settingsManageEdit=='feed:'+feed.id">
+                                            <input type="text" class="form-control" :value="feed.title">
+                                            <div class="input-group-append">
+                                                <button class="btn btn-outline-secondary">Rename</button>
+                                                <button class="btn btn-outline-secondary" @click="settingsManageEdit=null">&times;</button>
+                                            </div>
                                         </div>
+                                        <span v-else>
+                                            {{ feed.title }}
+                                        </span>
+                                    </div>
+                                    <div class="flex-shrink-0">
+                                        <div class="dropdown d-inline-block">
+                                            <button class="btn btn-link p-1" @click="settingsManageEdit='feed:'+feed.id">
+                                                <img src="./static/images/edit.svg">
+                                            </button>
+                                            <button class="btn btn-link p-1" @click="settingsManageDropdown='feed:'+feed.id">
+                                                <img src="./static/images/folder.svg">
+                                            </button>
+                                            <div class="dropdown-menu show py-0 overflow-hidden"
+                                                 style="top: 0; left: 0; position: absolute; transform: translate3d(0, 38px, 0px);"
+                                                 v-if="settingsManageDropdown=='feed:'+feed.id">
+                                                <a href="#" class="dropdown-item px-3"
+                                                   @click.prevent="moveFeed(feed, null)" v-if="feed.folder_id">Uncategorized</a>
+                                                <a href="#" class="dropdown-item px-3"
+                                                   v-if="folder.id != feed.folder_id"
+                                                   v-for="folder in folders"
+                                                   @click.prevent="moveFeed(feed, folder)">
+                                                    {{ folder.title }}
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <button class="btn btn-link p-1">
+                                            <img src="./static/images/trash-2.svg">
+                                        </button>
                                     </div>
-                                    <button class="btn btn-link">
-                                        <img src="./static/images/trash-2.svg">
-                                    </button>
                                 </div>
                             </div>
-                            <div class="mt-4">
-                                <label for="">New Folder</label>
-                                <div class="input-group mb-3">
-                                    <input type="text" class="form-control" v-model="newFolderTitle">
+                            <div class="mt-5">
+                                <label for="settings-new-folder">New Folder</label>
+                                <div class="input-group">
+                                    <input id="settings-new-folder" type="text" class="form-control" v-model="newFolderTitle">
                                     <div class="input-group-append">
                                         <button class="btn btn-outline-secondary" @click="newFolderCreate()">Add</button>
                                     </div>
diff --git a/template/static/images/edit.svg b/template/static/images/edit.svg
new file mode 100644
index 0000000..ec7b4ca
--- /dev/null
+++ b/template/static/images/edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg>
\ No newline at end of file
diff --git a/template/static/javascripts/app.js b/template/static/javascripts/app.js
index c250a9a..236b521 100644
--- a/template/static/javascripts/app.js
+++ b/template/static/javascripts/app.js
@@ -34,6 +34,7 @@ var vm = new Vue({
       'settingsShow': false,
       'settings': 'manage',
       'settingsManageDropdown': null,
+      'settingsManageEdit': null,
       'newFolderTitle': null,
     }
   },
diff --git a/template/static/stylesheets/app.css b/template/static/stylesheets/app.css
index 5474e0d..962acc1 100644
--- a/template/static/stylesheets/app.css
+++ b/template/static/stylesheets/app.css
@@ -2,6 +2,23 @@
   display: none !important;
 }
 
+body {
+  font-size: 15px !important;
+}
+
+.form-control {
+  transition: none;
+}
+
+.form-control:focus {
+  border-color: #80bdff !important;
+  box-shadow: inset 0 0 0 2px #80bdff !important;
+}
+
+.btn:focus {
+  box-shadow: none !important;
+}
+
 .wrapper {
   max-width: 1368px;
   margin: 0 auto;