added final changes to app