Update headshots, some refactorings and template revisions