Improvements and tweaks for iOS7
Merged