changed some broken twigs along with accountController
Merge remote-tracking branch 'origin/master'