Added menu button partial handling