Christmas commit. Merged list of outstanding payments. Cleanup of settlements view