Added menu items and event handlers