Some more tweaks to the expense generation logic and UI tweaks