Improvements, adding iPad check