Cleaned up layout pages and updated content