cleanup and fixed up menus and added a close button