Almost Final

fix ios7 bug