Improving Invitations and functionality in general