Refactor status display and names