added page and menu support