Develop

Fixed layout for iphone 6 and 6+