Problems screen refactoring I