Flyout menu design iPad edit!
Merge remote-tracking branch 'origin/master'
design fixes
Merge remote-tracking branch 'origin/master'
lots of changes