fixed iOS7 warnings and layout, untested