Improve sample app.