Added container-percentage and removed double layout--container stuff for a nicer default layout