Revert "Revert "Screens weiter überarbeitet""

This reverts commit 00677d9b20c452af3e12ba26c2514d37cc7143fa.