WP-2209: make alignment and spacing changes.