Branch: fix/minor_ux_bugs

Image Creation timestamp: Fri, 21 Aug 2026 15:08:53 +0000