Status app refactoring