Basic content and layout updated

Basic content and layout updated