Task #639 change template to fit with the new tweeter accounts