:+1: on leaving it as is, less template changes here means less chances of conflicts when I merge this into `develop-frontend`