Improved display and more robust settings handling