templates update for better testing performance. minor css improvement