First steps in sample app
Improving sample app