updates to popup for menu icons
merge into dev
merge dev with bubba
merge
tabs updated
merge conflicts updated