improvements across accounts app and common templates