fixing app functionality