Some layout adjustments for template creation since we dropped Description.