Added more properties to Account, updated default view