textmenu cleaned up and updated