diff --git a/README.md b/README.md
index 696d46da..45aa32dc 100644
--- a/README.md
+++ b/README.md
@@ -10,128 +10,196 @@ A [Hacker News](https://news.ycombinator.com/) client built with Flutter.
 
 [<img src="assets/images/app_store_badge.png" height="50">](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone) [<img src="assets/images/google_play_badge.png" height="50">](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US) [<img src="assets/images/f_droid_badge.png" height="50">](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
 
-
-Features:
-- Log in using your Hacker News account.
-- Browse stories from various categories.
-- Search for stories.
-- Submit stories.
-- Pin stories.
-- Mark stories as favorite.
-- Leave comments.
-- Collapse comments.
-- View parent comments without scrolling up.
-- View and participate in polls.
-- Browse comments and stories you have posted.
-- Vote on comments or stories.
-- Get in-app notification when there is new reply to your stories or comments.
-- Download stories and comments for offline reading.
-- Pick up where you left off.
-- Synced favorites and pins across devices. (iOS only)
-- Export or import your favorites.
-- Launch from system share sheet.
-- Share story or comment as image.
+# Features
+- Hacker News account [login](#login-reply-notification-favorites-sync-and-more)
+- [Favorites sync](#login-reply-notification-favorites-sync-and-more)
+- [Hacker News Search](#hacker-news-search)
+- [In-thread search](#in-thread-local-and-global-search)
+- [Ancestor lookup](#ancestor-lookup) so you don't have to scroll back up to regain context
+- [In-thread notification for new comments](#new-comments-notification-and-lookup) since your last visit
+- [In-app notification for new replies](#login-reply-notification-favorites-sync-and-more) to your comments or stories
+- [Offline mode](#settings)
+- Synced settings across devices (iOS only)
+- [Favorites import and export](#settings)
+- Open Hacker News link in Hacki via system share dialog
+- [Share story or comment as image](#share-story-or-comment-as-image)
+- [Reply](#reply-to-comment-or-story), vote, filter, block
+- [Polls](#polls)
+- [True dark mode](#true-dark-mode)
+- [Tablet support](#tablet-support)
+- [Accent color](#thread) and [font customization](#accent-color-and-font-customization)
 - And more...
 
+## Home page and story tile customization
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_01.png">
+    <img width="200" src="assets/new_screenshots/hacki_04.png">
+    <img width="200" src="assets/new_screenshots/hacki_05.png"> 
+    <img width="200" src="assets/new_screenshots/hacki_08.png"> 
+    <img width="200" src="assets/new_screenshots/hacki_02.png"> 
+    <img width="200" src="assets/new_screenshots/hacki_03.png">
+    <img width="200" src="assets/new_screenshots/hacki_06.png">
+    <img width="200" src="assets/new_screenshots/hacki_07.png">
+    <img width="200" src="assets/new_screenshots/hacki_09.png">
+    <img width="200" src="assets/new_screenshots/hacki_10.png"> 
+    <img width="200" src="assets/new_screenshots/hacki_11.png"> 
+    <img width="200" src="assets/new_screenshots/hacki_12.png">
+</p>
+
+## Thread
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_21.png"> 
+    <img width="200" src="assets/new_screenshots/hacki_70.png">
+    <img width="200" src="assets/new_screenshots/hacki_22.png"> 
+    <img width="200" src="assets/new_screenshots/hacki_69.png">
+</p>
 
-# Home page and story tile customization
+## New comments notification and lookup
 <p align="center">
-    <img width="200" alt="01" src="assets/new_screenshots/hacki_01.png">
-    <img width="200" alt="07" src="assets/new_screenshots/hacki_04.png">
-    <img width="200" alt="03" src="assets/new_screenshots/hacki_05.png"> 
-    <img width="200" alt="09" src="assets/new_screenshots/hacki_08.png"> 
-    <img width="200" alt="06" src="assets/new_screenshots/hacki_02.png"> 
-    <img width="200" alt="02" src="assets/new_screenshots/hacki_03.png">
-    <img width="200" alt="08" src="assets/new_screenshots/hacki_06.png">
-    <img width="200" alt="04" src="assets/new_screenshots/hacki_07.png">
-    <img width="200" alt="05" src="assets/new_screenshots/hacki_09.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_10.png"> 
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_11.png"> 
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_12.png">
+    <img width="300" src="assets/new_screenshots/hacki_59.png"> 
+    <img width="300" src="assets/new_screenshots/hacki_60.png">
 </p>
 
-# Thread reading experience
+## In-thread local and global search
+<p align="center">
+    <img width="250" src="assets/new_screenshots/hacki_91.png">
+    <img width="250" src="assets/new_screenshots/hacki_93.png">
+    <img width="250" src="assets/new_screenshots/hacki_95.png">
+    <img width="250" src="assets/new_screenshots/hacki_101.png">
+    <img width="250" src="assets/new_screenshots/hacki_97.png">
+    <img width="250" src="assets/new_screenshots/hacki_99.png">
+</p>
+<p align="center">
+    <img width="250" src="assets/new_screenshots/hacki_92.png">
+    <img width="250" src="assets/new_screenshots/hacki_94.png">
+    <img width="250" src="assets/new_screenshots/hacki_96.png">
+    <img width="250" src="assets/new_screenshots/hacki_102.png">
+    <img width="250" src="assets/new_screenshots/hacki_98.png">
+    <img width="250" src="assets/new_screenshots/hacki_100.png">
+</p>
+
+## Ancestor lookup
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_61.png">
+    <img width="200" src="assets/new_screenshots/hacki_64.png">
+    <img width="200" src="assets/new_screenshots/hacki_65.png">
+    <img width="200" src="assets/new_screenshots/hacki_68.png">
+</p>
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_62.png">
+    <img width="200" src="assets/new_screenshots/hacki_63.png">
+    <img width="200" src="assets/new_screenshots/hacki_66.png">
+    <img width="200" src="assets/new_screenshots/hacki_67.png">
+</p>
 
-### Thread
+## Share story or comment as image
 <p align="center">
-    <img width="200" alt="01" src="assets/new_screenshots/hacki_21.png"> 
-    <img width="200" alt="06" src="assets/new_screenshots/hacki_22.png"> 
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_69.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_70.png">
+    <img width="250" src="assets/new_screenshots/hacki_103.png">
+    <img width="250" src="assets/new_screenshots/hacki_105.png">
+    <img width="250" src="assets/new_screenshots/hacki_107.png">
+    <img width="250" src="assets/new_screenshots/hacki_109.png">
+    <img width="250" src="assets/new_screenshots/hacki_111.png">
+    <img width="250" src="assets/new_screenshots/hacki_113.png">
 </p>
 
-### New comments notification and lookup
 <p align="center">
-    <img width="300" alt="10" src="assets/new_screenshots/hacki_59.png"> 
-    <img width="300" alt="10" src="assets/new_screenshots/hacki_60.png">
+    <img width="250" src="assets/new_screenshots/hacki_104.png">
+    <img width="250" src="assets/new_screenshots/hacki_106.png">
+    <img width="250" src="assets/new_screenshots/hacki_108.png">
+    <img width="250" src="assets/new_screenshots/hacki_110.png">
+    <img width="250" src="assets/new_screenshots/hacki_112.png">
+    <img width="250" src="assets/new_screenshots/hacki_114.png">
 </p>
 
-### In-thread search and other actions
+## Reply to comment or story
 <p align="center">
-    <img width="200" alt="02" src="assets/new_screenshots/hacki_23.png">
-    <img width="200" alt="03" src="assets/new_screenshots/hacki_25.png">
-    <img width="200" alt="09" src="assets/new_screenshots/hacki_28.png">
-    <img width="200" alt="05" src="assets/new_screenshots/hacki_29.png">
-    <img width="200" alt="07" src="assets/new_screenshots/hacki_24.png">
-    <img width="200" alt="08" src="assets/new_screenshots/hacki_26.png">
-    <img width="200" alt="04" src="assets/new_screenshots/hacki_27.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_30.png">
+    <img width="200" src="assets/new_screenshots/hacki_115.png">
+    <img width="200" src="assets/new_screenshots/hacki_117.png">
+    <img width="200" src="assets/new_screenshots/hacki_119.png">
+    <img width="200" src="assets/new_screenshots/hacki_121.png">
+</p>
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_116.png">
+    <img width="200" src="assets/new_screenshots/hacki_118.png">
+    <img width="200" src="assets/new_screenshots/hacki_120.png">
+    <img width="200" src="assets/new_screenshots/hacki_122.png">
 </p>
 
-### Ancestor lookup
+## Open comment in separate thread
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_135.png">
+    <img width="200" src="assets/new_screenshots/hacki_137.png">
+    <img width="200" src="assets/new_screenshots/hacki_139.png">
+    <img width="200" src="assets/new_screenshots/hacki_141.png">
+</p>
 <p align="center">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_61.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_64.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_65.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_68.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_62.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_63.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_66.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_67.png">
+    <img width="200" src="assets/new_screenshots/hacki_136.png">
+    <img width="200" src="assets/new_screenshots/hacki_138.png">
+    <img width="200" src="assets/new_screenshots/hacki_140.png">
+    <img width="200" src="assets/new_screenshots/hacki_142.png">
 </p>
 
-### Story and comment sharing
+# Hacker News search
 <p align="center">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_85.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_88.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_89.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_84.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_86.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_87.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_90.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_83.png">
+    <img width="250" src="assets/new_screenshots/hacki_129.png">
+    <img width="250" src="assets/new_screenshots/hacki_131.png">
+    <img width="250" src="assets/new_screenshots/hacki_133.png">
+</p>
+<p align="center">
+    <img width="250" src="assets/new_screenshots/hacki_130.png">
+    <img width="250" src="assets/new_screenshots/hacki_132.png">
+    <img width="250" src="assets/new_screenshots/hacki_134.png">
 </p>
 
 # Login, reply notification, favorites sync and more
 <p align="center">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_37.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_39.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_47.png">
+    <img width="250" src="assets/new_screenshots/hacki_37.png">
+    <img width="250" src="assets/new_screenshots/hacki_39.png">
+    <img width="250" src="assets/new_screenshots/hacki_47.png">
 </p>
 <p align="center">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_38.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_40.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_48.png">
+    <img width="250" src="assets/new_screenshots/hacki_38.png">
+    <img width="250" src="assets/new_screenshots/hacki_40.png">
+    <img width="250" src="assets/new_screenshots/hacki_48.png">
 </p>
 
 # Settings
 <p align="center">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_71.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_74.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_75.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_78.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_72.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_73.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_76.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_77.png">
+    <img width="200" src="assets/new_screenshots/hacki_71.png">
+    <img width="200" src="assets/new_screenshots/hacki_74.png">
+    <img width="200" src="assets/new_screenshots/hacki_75.png">
+    <img width="200" src="assets/new_screenshots/hacki_78.png">
+</p>
+
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_72.png">
+    <img width="200" src="assets/new_screenshots/hacki_73.png">
+    <img width="200" src="assets/new_screenshots/hacki_76.png">
+    <img width="200" src="assets/new_screenshots/hacki_77.png">
 </p>
 
 # Accent color and font customization
 <p align="center">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_79.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_80.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_81.png">
-    <img width="200" alt="10" src="assets/new_screenshots/hacki_82.png">
+    <img width="200" src="assets/new_screenshots/hacki_79.png">
+    <img width="200" src="assets/new_screenshots/hacki_80.png">
+    <img width="200" src="assets/new_screenshots/hacki_81.png">
+    <img width="200" src="assets/new_screenshots/hacki_82.png">
+</p>
+
+# True dark mode
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_143.png">
+    <img width="200" src="assets/new_screenshots/hacki_145.png">
+    <img width="200" src="assets/new_screenshots/hacki_144.png">
+    <img width="200" src="assets/new_screenshots/hacki_146.png">
+</p>
+
+# Polls
+<p align="center">
+    <img width="200" src="assets/new_screenshots/hacki_147.png">
+    <img width="200" src="assets/new_screenshots/hacki_148.png">
+    <img width="200" src="assets/new_screenshots/hacki_149.png">
+    <img width="200" src="assets/new_screenshots/hacki_150.png">
 </p>
 
 # Tablet support
diff --git a/assets/new_screenshots/hacki_100.png b/assets/new_screenshots/hacki_100.png
new file mode 100644
index 00000000..f7a46404
Binary files /dev/null and b/assets/new_screenshots/hacki_100.png differ
diff --git a/assets/new_screenshots/hacki_101.png b/assets/new_screenshots/hacki_101.png
new file mode 100644
index 00000000..8e930cc7
Binary files /dev/null and b/assets/new_screenshots/hacki_101.png differ
diff --git a/assets/new_screenshots/hacki_102.png b/assets/new_screenshots/hacki_102.png
new file mode 100644
index 00000000..1118d066
Binary files /dev/null and b/assets/new_screenshots/hacki_102.png differ
diff --git a/assets/new_screenshots/hacki_103.png b/assets/new_screenshots/hacki_103.png
new file mode 100644
index 00000000..7aca0ea7
Binary files /dev/null and b/assets/new_screenshots/hacki_103.png differ
diff --git a/assets/new_screenshots/hacki_104.png b/assets/new_screenshots/hacki_104.png
new file mode 100644
index 00000000..add728d5
Binary files /dev/null and b/assets/new_screenshots/hacki_104.png differ
diff --git a/assets/new_screenshots/hacki_105.png b/assets/new_screenshots/hacki_105.png
new file mode 100644
index 00000000..f2aa4edc
Binary files /dev/null and b/assets/new_screenshots/hacki_105.png differ
diff --git a/assets/new_screenshots/hacki_106.png b/assets/new_screenshots/hacki_106.png
new file mode 100644
index 00000000..8b3a00b9
Binary files /dev/null and b/assets/new_screenshots/hacki_106.png differ
diff --git a/assets/new_screenshots/hacki_107.png b/assets/new_screenshots/hacki_107.png
new file mode 100644
index 00000000..84d334eb
Binary files /dev/null and b/assets/new_screenshots/hacki_107.png differ
diff --git a/assets/new_screenshots/hacki_108.png b/assets/new_screenshots/hacki_108.png
new file mode 100644
index 00000000..7ef8ab1d
Binary files /dev/null and b/assets/new_screenshots/hacki_108.png differ
diff --git a/assets/new_screenshots/hacki_109.png b/assets/new_screenshots/hacki_109.png
new file mode 100644
index 00000000..0f7326d6
Binary files /dev/null and b/assets/new_screenshots/hacki_109.png differ
diff --git a/assets/new_screenshots/hacki_110.png b/assets/new_screenshots/hacki_110.png
new file mode 100644
index 00000000..9d36a9a2
Binary files /dev/null and b/assets/new_screenshots/hacki_110.png differ
diff --git a/assets/new_screenshots/hacki_111.png b/assets/new_screenshots/hacki_111.png
new file mode 100644
index 00000000..e92884d8
Binary files /dev/null and b/assets/new_screenshots/hacki_111.png differ
diff --git a/assets/new_screenshots/hacki_112.png b/assets/new_screenshots/hacki_112.png
new file mode 100644
index 00000000..59b4b6c0
Binary files /dev/null and b/assets/new_screenshots/hacki_112.png differ
diff --git a/assets/new_screenshots/hacki_113.png b/assets/new_screenshots/hacki_113.png
new file mode 100644
index 00000000..f7115c04
Binary files /dev/null and b/assets/new_screenshots/hacki_113.png differ
diff --git a/assets/new_screenshots/hacki_114.png b/assets/new_screenshots/hacki_114.png
new file mode 100644
index 00000000..9b427886
Binary files /dev/null and b/assets/new_screenshots/hacki_114.png differ
diff --git a/assets/new_screenshots/hacki_115.png b/assets/new_screenshots/hacki_115.png
new file mode 100644
index 00000000..b5728816
Binary files /dev/null and b/assets/new_screenshots/hacki_115.png differ
diff --git a/assets/new_screenshots/hacki_116.png b/assets/new_screenshots/hacki_116.png
new file mode 100644
index 00000000..686abf5a
Binary files /dev/null and b/assets/new_screenshots/hacki_116.png differ
diff --git a/assets/new_screenshots/hacki_117.png b/assets/new_screenshots/hacki_117.png
new file mode 100644
index 00000000..2efb42aa
Binary files /dev/null and b/assets/new_screenshots/hacki_117.png differ
diff --git a/assets/new_screenshots/hacki_118.png b/assets/new_screenshots/hacki_118.png
new file mode 100644
index 00000000..443b28d7
Binary files /dev/null and b/assets/new_screenshots/hacki_118.png differ
diff --git a/assets/new_screenshots/hacki_119.png b/assets/new_screenshots/hacki_119.png
new file mode 100644
index 00000000..f63637f9
Binary files /dev/null and b/assets/new_screenshots/hacki_119.png differ
diff --git a/assets/new_screenshots/hacki_120.png b/assets/new_screenshots/hacki_120.png
new file mode 100644
index 00000000..794078ac
Binary files /dev/null and b/assets/new_screenshots/hacki_120.png differ
diff --git a/assets/new_screenshots/hacki_121.png b/assets/new_screenshots/hacki_121.png
new file mode 100644
index 00000000..73deab1b
Binary files /dev/null and b/assets/new_screenshots/hacki_121.png differ
diff --git a/assets/new_screenshots/hacki_122.png b/assets/new_screenshots/hacki_122.png
new file mode 100644
index 00000000..b09b375d
Binary files /dev/null and b/assets/new_screenshots/hacki_122.png differ
diff --git a/assets/new_screenshots/hacki_123.png b/assets/new_screenshots/hacki_123.png
new file mode 100644
index 00000000..738c56e5
Binary files /dev/null and b/assets/new_screenshots/hacki_123.png differ
diff --git a/assets/new_screenshots/hacki_124.png b/assets/new_screenshots/hacki_124.png
new file mode 100644
index 00000000..d6fef3b0
Binary files /dev/null and b/assets/new_screenshots/hacki_124.png differ
diff --git a/assets/new_screenshots/hacki_125.png b/assets/new_screenshots/hacki_125.png
new file mode 100644
index 00000000..a87df16b
Binary files /dev/null and b/assets/new_screenshots/hacki_125.png differ
diff --git a/assets/new_screenshots/hacki_126.png b/assets/new_screenshots/hacki_126.png
new file mode 100644
index 00000000..a53e39b8
Binary files /dev/null and b/assets/new_screenshots/hacki_126.png differ
diff --git a/assets/new_screenshots/hacki_127.png b/assets/new_screenshots/hacki_127.png
new file mode 100644
index 00000000..7f4ee98a
Binary files /dev/null and b/assets/new_screenshots/hacki_127.png differ
diff --git a/assets/new_screenshots/hacki_128.png b/assets/new_screenshots/hacki_128.png
new file mode 100644
index 00000000..8880129f
Binary files /dev/null and b/assets/new_screenshots/hacki_128.png differ
diff --git a/assets/new_screenshots/hacki_129.png b/assets/new_screenshots/hacki_129.png
new file mode 100644
index 00000000..238c99d9
Binary files /dev/null and b/assets/new_screenshots/hacki_129.png differ
diff --git a/assets/new_screenshots/hacki_130.png b/assets/new_screenshots/hacki_130.png
new file mode 100644
index 00000000..5e26c4d6
Binary files /dev/null and b/assets/new_screenshots/hacki_130.png differ
diff --git a/assets/new_screenshots/hacki_131.png b/assets/new_screenshots/hacki_131.png
new file mode 100644
index 00000000..677c1d90
Binary files /dev/null and b/assets/new_screenshots/hacki_131.png differ
diff --git a/assets/new_screenshots/hacki_132.png b/assets/new_screenshots/hacki_132.png
new file mode 100644
index 00000000..642f353f
Binary files /dev/null and b/assets/new_screenshots/hacki_132.png differ
diff --git a/assets/new_screenshots/hacki_133.png b/assets/new_screenshots/hacki_133.png
new file mode 100644
index 00000000..e2ee474b
Binary files /dev/null and b/assets/new_screenshots/hacki_133.png differ
diff --git a/assets/new_screenshots/hacki_134.png b/assets/new_screenshots/hacki_134.png
new file mode 100644
index 00000000..554b0d87
Binary files /dev/null and b/assets/new_screenshots/hacki_134.png differ
diff --git a/assets/new_screenshots/hacki_135.png b/assets/new_screenshots/hacki_135.png
new file mode 100644
index 00000000..33ed369d
Binary files /dev/null and b/assets/new_screenshots/hacki_135.png differ
diff --git a/assets/new_screenshots/hacki_136.png b/assets/new_screenshots/hacki_136.png
new file mode 100644
index 00000000..266db0ba
Binary files /dev/null and b/assets/new_screenshots/hacki_136.png differ
diff --git a/assets/new_screenshots/hacki_137.png b/assets/new_screenshots/hacki_137.png
new file mode 100644
index 00000000..5c2192d3
Binary files /dev/null and b/assets/new_screenshots/hacki_137.png differ
diff --git a/assets/new_screenshots/hacki_138.png b/assets/new_screenshots/hacki_138.png
new file mode 100644
index 00000000..e623121b
Binary files /dev/null and b/assets/new_screenshots/hacki_138.png differ
diff --git a/assets/new_screenshots/hacki_139.png b/assets/new_screenshots/hacki_139.png
new file mode 100644
index 00000000..14372cc0
Binary files /dev/null and b/assets/new_screenshots/hacki_139.png differ
diff --git a/assets/new_screenshots/hacki_140.png b/assets/new_screenshots/hacki_140.png
new file mode 100644
index 00000000..b6a7a71a
Binary files /dev/null and b/assets/new_screenshots/hacki_140.png differ
diff --git a/assets/new_screenshots/hacki_141.png b/assets/new_screenshots/hacki_141.png
new file mode 100644
index 00000000..65e9430e
Binary files /dev/null and b/assets/new_screenshots/hacki_141.png differ
diff --git a/assets/new_screenshots/hacki_142.png b/assets/new_screenshots/hacki_142.png
new file mode 100644
index 00000000..e4d5c252
Binary files /dev/null and b/assets/new_screenshots/hacki_142.png differ
diff --git a/assets/new_screenshots/hacki_143.png b/assets/new_screenshots/hacki_143.png
new file mode 100644
index 00000000..b2650f9b
Binary files /dev/null and b/assets/new_screenshots/hacki_143.png differ
diff --git a/assets/new_screenshots/hacki_144.png b/assets/new_screenshots/hacki_144.png
new file mode 100644
index 00000000..9f9303d9
Binary files /dev/null and b/assets/new_screenshots/hacki_144.png differ
diff --git a/assets/new_screenshots/hacki_145.png b/assets/new_screenshots/hacki_145.png
new file mode 100644
index 00000000..e1969ff2
Binary files /dev/null and b/assets/new_screenshots/hacki_145.png differ
diff --git a/assets/new_screenshots/hacki_146.png b/assets/new_screenshots/hacki_146.png
new file mode 100644
index 00000000..47d9a5a9
Binary files /dev/null and b/assets/new_screenshots/hacki_146.png differ
diff --git a/assets/new_screenshots/hacki_147.png b/assets/new_screenshots/hacki_147.png
new file mode 100644
index 00000000..58992dab
Binary files /dev/null and b/assets/new_screenshots/hacki_147.png differ
diff --git a/assets/new_screenshots/hacki_148.png b/assets/new_screenshots/hacki_148.png
new file mode 100644
index 00000000..43e27859
Binary files /dev/null and b/assets/new_screenshots/hacki_148.png differ
diff --git a/assets/new_screenshots/hacki_149.png b/assets/new_screenshots/hacki_149.png
new file mode 100644
index 00000000..a413b5ba
Binary files /dev/null and b/assets/new_screenshots/hacki_149.png differ
diff --git a/assets/new_screenshots/hacki_150.png b/assets/new_screenshots/hacki_150.png
new file mode 100644
index 00000000..f846b106
Binary files /dev/null and b/assets/new_screenshots/hacki_150.png differ
diff --git a/assets/new_screenshots/hacki_91.png b/assets/new_screenshots/hacki_91.png
new file mode 100644
index 00000000..cba9f45d
Binary files /dev/null and b/assets/new_screenshots/hacki_91.png differ
diff --git a/assets/new_screenshots/hacki_92.png b/assets/new_screenshots/hacki_92.png
new file mode 100644
index 00000000..c550cbf1
Binary files /dev/null and b/assets/new_screenshots/hacki_92.png differ
diff --git a/assets/new_screenshots/hacki_93.png b/assets/new_screenshots/hacki_93.png
new file mode 100644
index 00000000..e7ffd0d7
Binary files /dev/null and b/assets/new_screenshots/hacki_93.png differ
diff --git a/assets/new_screenshots/hacki_94.png b/assets/new_screenshots/hacki_94.png
new file mode 100644
index 00000000..f01919c9
Binary files /dev/null and b/assets/new_screenshots/hacki_94.png differ
diff --git a/assets/new_screenshots/hacki_95.png b/assets/new_screenshots/hacki_95.png
new file mode 100644
index 00000000..57884977
Binary files /dev/null and b/assets/new_screenshots/hacki_95.png differ
diff --git a/assets/new_screenshots/hacki_96.png b/assets/new_screenshots/hacki_96.png
new file mode 100644
index 00000000..f24778c7
Binary files /dev/null and b/assets/new_screenshots/hacki_96.png differ
diff --git a/assets/new_screenshots/hacki_97.png b/assets/new_screenshots/hacki_97.png
new file mode 100644
index 00000000..e140e9b2
Binary files /dev/null and b/assets/new_screenshots/hacki_97.png differ
diff --git a/assets/new_screenshots/hacki_98.png b/assets/new_screenshots/hacki_98.png
new file mode 100644
index 00000000..0c58cad9
Binary files /dev/null and b/assets/new_screenshots/hacki_98.png differ
diff --git a/assets/new_screenshots/hacki_99.png b/assets/new_screenshots/hacki_99.png
new file mode 100644
index 00000000..ef844d76
Binary files /dev/null and b/assets/new_screenshots/hacki_99.png differ
diff --git a/lib/screens/item/item_screen.dart b/lib/screens/item/item_screen.dart
index 371a9bfc..53edaaf5 100644
--- a/lib/screens/item/item_screen.dart
+++ b/lib/screens/item/item_screen.dart
@@ -310,6 +310,7 @@ class _ItemScreenState extends State<ItemScreen>
                               rect,
                               parent: item,
                               onSearchInThreadTapped: () {
+                                context.pop();
                                 context.read<CommentsCubit>()
                                   ..search(item.by)
                                   ..openInThreadSearch?.call();
@@ -418,6 +419,7 @@ class _ItemScreenState extends State<ItemScreen>
                               rect,
                               parent: widget.item,
                               onSearchInThreadTapped: () {
+                                context.pop();
                                 context.read<CommentsCubit>()
                                   ..search(item.by)
                                   ..openInThreadSearch?.call();
diff --git a/lib/screens/item/widgets/item_screen_background.dart b/lib/screens/item/widgets/item_screen_background.dart
index adc73ec6..b483589c 100644
--- a/lib/screens/item/widgets/item_screen_background.dart
+++ b/lib/screens/item/widgets/item_screen_background.dart
@@ -38,7 +38,7 @@ class _ItemScreenBackgroundState extends State<ItemScreenBackground> {
 
     unawaited(
       Future<void>.delayed(
-        AppDurations.oneAndHalfSeconds,
+        AppDurations.oneSecond,
         () {
           if (mounted) {
             setState(() {
diff --git a/lib/screens/item/widgets/main_view.dart b/lib/screens/item/widgets/main_view.dart
index f38d8935..e118657f 100644
--- a/lib/screens/item/widgets/main_view.dart
+++ b/lib/screens/item/widgets/main_view.dart
@@ -474,6 +474,7 @@ class _ParentItemSection extends StatelessWidget {
                                 child: Padding(
                                   padding: const EdgeInsets.only(
                                     left: Dimens.pt8,
+                                    bottom: Dimens.pt8,
                                   ),
                                   child: ItemText(
                                     item: item,
@@ -488,20 +489,18 @@ class _ParentItemSection extends StatelessWidget {
                       );
                     },
                   ),
-                  if (item is Story && item.isPoll)
+                  if (item is Story && item.isPoll) ...<Widget>[
                     BlocProvider<PollCubit>(
                       create: (BuildContext context) =>
                           PollCubit(story: item)..init(),
                       child: const PollView(),
                     ),
+                    SizedBoxes.pt6,
+                  ],
                 ],
               ),
             ),
           ),
-          if (item.text.isNotEmpty)
-            const SizedBox(
-              height: Dimens.pt8,
-            ),
           const Divider(
             height: Dimens.zero,
           ),
diff --git a/lib/screens/item/widgets/poll_view.dart b/lib/screens/item/widgets/poll_view.dart
index 5102ec8b..ba7a1701 100644
--- a/lib/screens/item/widgets/poll_view.dart
+++ b/lib/screens/item/widgets/poll_view.dart
@@ -23,9 +23,6 @@ class _PollViewState extends State<PollView> with ItemActionMixin {
       builder: (BuildContext context, PollState state) {
         return Column(
           children: <Widget>[
-            const SizedBox(
-              height: Dimens.pt24,
-            ),
             if (state.status == Status.inProgress) ...<Widget>[
               const LinearProgressIndicator(),
               const SizedBox(
diff --git a/lib/screens/item/widgets/reply_box.dart b/lib/screens/item/widgets/reply_box.dart
index 0176b8a1..d835e22f 100644
--- a/lib/screens/item/widgets/reply_box.dart
+++ b/lib/screens/item/widgets/reply_box.dart
@@ -122,7 +122,7 @@ class _ReplyBoxState extends State<ReplyBox> with ItemActionMixin {
                           ),
                           if (!isLoading) ...<Widget>[
                             ...<Widget>[
-                              if (replyingTo != null)
+                              if (replyingTo != null && replyingTo is Comment)
                                 AnimatedOpacity(
                                   opacity:
                                       expanded ? NumSwitch.on : NumSwitch.off,
diff --git a/pubspec.yaml b/pubspec.yaml
index 29922107..aa9a6010 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: hacki
 description: A Hacker News client.
-version: 3.5.2+352
+version: 3.6.0+360
 publish_to: none
 
 environment: