Improving account dialog box behavior.
Added template TODO.
Merge branch 'master' into new-annotations2