BZ-11942: UI Fixes

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