More testing to android layout. Moved all rotation to xml file, this cleans up the java code.