Cleaned up navigation/index
Added subtotals and grand totals to reports