Move some HTML out to templates