Fix menu toggle issue