Me and Feena: round 2 of proposed party experience changes.
Merge branch 'master' of https://github.com/everial/en