Fix menu regression.
Make default layout independent of the package.