Content and some minimum layout changes