Updated Content and layout