Fixed ipad and iphone bugs