change db structure
rework db
standardize views for expense
merge from master