Made fixes for iPad and iPhone