refactor account model needs tests and update some views