add new mnu btn, reorder opts, add icons, closes #21