Make button compatible with iOS 6
misc updates