Update-app and fixed bug