Pull request iPad bug fixes

iPad bug fixes