Change xml style of screens and fix some issues with screens