Fix some alignment issues in RTL