Added default margin
Improved RTL support