updated account template and user class to work with simplified accounts...

... table