Until those things are looked at in the program, I can offer the Excel Template that I shared last year (you may need to update some amounts as they are from last year). It probably isn’t exactly what you are looking for but may save some data entry time.