Working out new income/expense layout