improve readability of html template and fix urls