Simplified expenses updates

https://www.pivotaltracker.com/story/show/51398313

Mostly copy, couple of small logic tweaks.