Styling fix for self service blocks
Merge conflict resolved