Tried to reduce dependencies in the menu classes.
Not sure if it will actually make a difference.