refactor account controller / template