jon-menu-modal merging with staging

Jon Sundinrequested to merge
jon-menu-modal into staging

implemented menu modal changes:

Merge request reports