Added new tabular view for expenses
Cleaned up code