removed the menu, fixed lazy load