[CTDA-103], re-arrange information in html template