Merge pull request #63 from pkkup/master

improvements across accounts app and common templates