Refactor content menus: make changes from 582963ad so that they only apply on izug4 layer.
Merge pull request #20 from 4teamwork/jone-content-menus

Refactor content menus