Added fix for chrome, removed not needed templates, fixed html markup