Refactor content menus

Make changes from 582963ad so that they only apply on izug4 layer.
/cc @maethu