More changes related to dynamic menu