Slight design fix and add invite counter
merge with Patrick