Expense show one and all fixed + minor bug fixes