changed handling of `container` and `container-fluid`