Refactoring and more work on the status screen.