Improve sample app