Refactoring of account templates and main views.