Fixed app functionality