Updated Layouts for proper titles and content