Account and User View template now merged into Account