Rework 'container' sizes and variables