Reworking menus to use @DomainServiceLayout etc.