Fixed some layout issues caused by the fix for rtl.