change design ipad/iphonn
merge
merge
merge 2