Fix to merge display menu items into layout menu (renamed now into display menu)
Fix the mosaic install not to change default views for the existing content types