optimized the main xml a bit