Fix issue with iPhone width and some borders

close #17