fix money spent and break

also refactor views a little