Moved html to templates