Better Tab-Management and sorted Roles
Merge branch 'release/1.0.2'