Refactoring changes in Debt row layout