Updated pages and menus and almost components