Refactor Debt Edit

Fixed #18
Fixed #44