updated pages and layout