Better app, include settings