#18 Modified methods used to get width of container