Changed Desktop app to use App