Changed a bit more of the app so it is ready to be updated in the store