[TASK] Template changes to display heads-up and other improvements