Flow out to contraints
Merge pull request #113 from blakeembrey/fix-popup-menu

Flow out to contraints