improved layout for ios 7 and removed auto-layout