Making more changes to the app