Fixes several bugs introduced with menus
Rebuild files