Adjusted role and menu setup