Updates to strings.xml, res/layout, and various other crap