Updated style and reformatted code.
Made minor changes to xml for better device compatibility.