Branch: fix/minor_ux_bugs

Image Creation timestamp: Fri, 21 Aug 2026 13:29:43 +0000