Improvements for app