multi device template improvements.