Updated layout to be iOS 8 compatible