Update buildout; Add mosaiclayouts
Fix to not hide the default display menu when layout menu is disabled