Committed changes from James M. for Android restyling