BZ-9549: UX fixes

Signed-off-by: Paden <padenportillo@gmail.com>