Render block templates as <div>s and inline ones as <span>s

Right now block templates are rendered as <span>s

Change-Id: I4c941a03e0e34a435990f0392080a3a8bf3e2835