Made it a bit more iOS 7 friendly