[WIP] Get ready for MenuBundle 2.0

did that in master