Added RTL support in the markup