Combine summary

Threaded the code for the single budget summary page with the code for the budget summary list.

Also fixed a few bugs that would have prevented the normal operation of this merge.