Updated more content and layout changes