improve rtl layout part 1