rearraged and changed display timing for some html elements on the templates