Improve example app