Added and fixed adds accross all the app