added fixes on app file