Fixes #1598: Align buttons correctly