add `container` option and fix positioning