added container margin to be optional
Merge branch 'master' into dialog