U4-3449 Polish UX so it matches grid