Moved some minor things around in the xml