Improve app generator