Little fixes and improvements (Xml and Style)