diff --git a/shortcodes/shortcode-my_account.php b/shortcodes/shortcode-my_account.php
index a330b06a9aa..1ff9d9c5be7 100644
--- a/shortcodes/shortcode-my_account.php
+++ b/shortcodes/shortcode-my_account.php
@@ -464,11 +464,22 @@ function woocommerce_view_order() {
 				if ($notes) :
 					?>
 					<h2><?php _e('Order Updates', 'woothemes'); ?></h2>
-					<ul class="notes">
+					<ol class="commentlist notes">	
 						<?php foreach ($notes as $note) : ?>
-							<li><p><strong><?php echo date_i18n('l jS \of F Y, h:ia', strtotime($note->comment_date)); ?></strong></p><?php echo wpautop(wptexturize($note->comment_content)); ?></li>
+						<li class="comment note">
+							<div class="comment_container">			
+								<div class="comment-text">
+									<p class="meta"><?php echo date_i18n('l jS \of F Y, h:ia', strtotime($note->comment_date)); ?></p>
+									<div class="description">
+										<?php echo wpautop(wptexturize($note->comment_content)); ?>
+									</div>
+					  				<div class="clear"></div>
+					  			</div>
+								<div class="clear"></div>			
+							</div>
+						</li>
 						<?php endforeach; ?>
-					</ul>
+					</ol>
 					<?php
 				endif;
 			?>
diff --git a/shortcodes/shortcode-order_tracking.php b/shortcodes/shortcode-order_tracking.php
index f21c3e865eb..25d32242293 100644
--- a/shortcodes/shortcode-order_tracking.php
+++ b/shortcodes/shortcode-order_tracking.php
@@ -48,11 +48,22 @@ function woocommerce_order_tracking( $atts ) {
 					if ($notes) :
 						?>
 						<h2><?php _e('Order Updates', 'woothemes'); ?></h2>
-						<ul class="notes">
+						<ol class="commentlist notes">	
 							<?php foreach ($notes as $note) : ?>
-								<li><p><strong><?php echo date_i18n('l jS \of F Y, h:ia', strtotime($note->comment_date)); ?></strong></p><?php echo wpautop(wptexturize($note->comment_content)); ?></li>
+							<li class="comment note">
+								<div class="comment_container">			
+									<div class="comment-text">
+										<p class="meta"><?php echo date_i18n('l jS \of F Y, h:ia', strtotime($note->comment_date)); ?></p>
+										<div class="description">
+											<?php echo wpautop(wptexturize($note->comment_content)); ?>
+										</div>
+						  				<div class="clear"></div>
+						  			</div>
+									<div class="clear"></div>			
+								</div>
+							</li>
 							<?php endforeach; ?>
-						</ul>
+						</ol>
 						<?php
 					endif;
 				?>