Refactored json expense data to be embedded in row tag