Improve Sample app