Modify some UI define and switch to UI iPad branch