Continued making changes for the app