Added better support for iPad