Some improvements - more iOS7 style behavior