Fix spacing when there are no assignments or entries
Merge remote-tracking branch 'origin/develop' into feature/user-groups