Better vertical alignment

(cherry picked from commit d07215641c3010d9f75ade439444d2202152722a)