Container width and other changes