Improve status indicator