update usage of size hint guard
update the container layout handling