diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 8c2415fe..cdccf813 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -240,7 +240,7 @@ static function layout_fields( array $fields ) { ?>
 
 				$current_colspan += $field->args['cols'];
 
-				$classes = array('field');
+				$classes = array( 'field', get_class($field) );
 
 				if ( ! empty( $field->args['repeatable'] ) )
 					$classes[] = 'repeatable';
@@ -248,22 +248,20 @@ static function layout_fields( array $fields ) { ?>
 				if ( ! empty( $field->args['sortable'] ) )
 					$classes[] = 'cmb-sortable';
 
-				$classes[] = get_class($field);
-
-				$classes = 'class="' . esc_attr( implode(' ', array_map( 'sanitize_html_class', $classes ) ) ) . '"';
-
-				$attrs = array();
+				$attrs = array(
+					sprintf( 'id="%s"', sanitize_html_class( $field->id ) ),
+					sprintf( 'class="%s"', esc_attr( implode(' ', array_map( 'sanitize_html_class', $classes ) ) ) )
+				);
 
+				// Field Repeatable Max.
 				if ( isset( $field->args['repeatable_max']  ) )
-					$attrs[] = 'data-rep-max="' . intval( $field->args['repeatable_max'] ) . '"';
-
-				$attrs = implode( ' ', $attrs );
+					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
 
 				?>
 
 				<div class="cmb-cell-<?php echo intval( $field->args['cols'] ); ?>">
 					
-						<div <?php echo $classes; ?> <?php echo $attrs; ?>>
+						<div <?php echo implode( ' ', $attrs ); ?>>
 							<?php $field->display(); ?>
 						</div>