Patch up layout code to work with iphone 6 and iphone 6 plus