Width/height container support and scaling