iOS7 adaptation + minor changes