Improvements on simple app