updates to popup for menu icons
 merge
merge into dev
merge
merge dev with bubba
merge
 footer update
api working
tabs updated
 merging mikey
mags
merging
merge conflicts updated
wokring on box 1