merging changes, added main account/view and other views