Some changes before supporting iPad version