moved extra html to templates