Menus updates and bugs fixed.