diff --git a/Roadmap.md b/Roadmap.md
index 7922f1f..ca1da6e 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -41,6 +41,7 @@
         - ☐ Ability to remove accidentally selected images before final upload
     - ☐ Tags
         - ☐ Autocomplete
+    - ☐ Flagging: SFW/sketchy/NSFW
     - ☐ Content type changes UI behaviour (it's senseless to upload file with content type set to youtube)
         - Implementation details - youtube can be stored as files as well, just plaintext containing URL/ID
     - ☐ Image gets unique file name so that it can be hotlinked by registered users, but it's url cannot be guessed by unregistered ones (accessing nsfw post by `/post/30065d2112f85177a20b81d2c4dd08fe.jpg` vs `/post/244.jpg`)
@@ -50,8 +51,22 @@
     - Implementation details: try to avoid duplicated code between post adding and editing, especially for validation stuff.
     - ☐ Tags
         - ☐ Autocomplete
+        - ☐ Adding
+        - ☐ Removal
     - ☐ Thumbnail
-    - [Proposition] flagging: SFW/sketchy/NSFW
+    - ☐ Flagging: SFW/sketchy/NSFW
+    - ☐ Favorites
+        - ☐ Adding
+        - ☐ Removal
+    - ☐ Comments
+        - ☐ Adding comment
+        - ☐ Modification of comment contents
+        - ☐ Comment removal
+        - ☐ Comment display
+            - ☐ Processing contents with Markdown parser
+            - ☐ Spoiler support (`[spoiler]...[/spoiler]`?)
+            - ☐ Post permalink support (`@123`)
+            - ☐ Tag permalink support (`#mushishi`)
 ## Browsing posts
     - Search capabilities:
         - ☐ No filter, just browsing
@@ -76,19 +91,6 @@
     - ☐ In either appraoch, some kind of default filter (like there is on wallbase.cc) so registered users must opt-in before showing NSFW content
 ## Post removal
 - ☐ Post removal
-## Misc
-- ☐ Adding post to favorites
-- ☐ Removing post from favorites
-
-# Comments
-- ☐ Adding comment
-- ☐ Modification of comment contents
-- ☐ Comment removal
-- ☐ Comment display
-    - ☐ Processing contents with Markdown parser
-    - ☐ Spoiler support (`[spoiler]...[/spoiler]`?)
-    - ☐ Post permalink support (`@123`)
-    - ☐ Tag permalink support (`#mushishi`)
 
 # Admin
 - ☐ Listing users