Rework the invitation menu
Fix #17