style
Merge https://github.com/VashMar/skill_mad
upload funnel fixes