added support for non-full width containers