Rearranged the xml attributes