Further progress on html + bootstrap templates