Branch: fix/minor_ux_bugs

Image Creation timestamp: Fri, 21 Aug 2026 12:10:45 +0000