Merge pull request #75 from vexxhost/improve-staffeln-ux

Improve staffeln ux