Fixing issues on ios7/ipad