fixed rtl issues