Added menu items
Added close handler