Added menu handler