Merge Setting view modification into iPad ver