Expanded containers section

... and other tweaks