Fix #4 - layout mess in iOS8