Updated pages and components