Fixes for menus and abuses

No more shit and giggles