Refactoring report layouts