More container page tweaks for #1272