Fix status indicator to work. Refactoring.