UAR-491 Second pass at UI customizations