Change xml style of screens and fix some issues with screens
Merge pull request #1371 from Flakebi/master

Change xml style of screens and fix some issues with screens