[RH] layout improvements