Fixes

Menus are fixed and working.