diff --git a/comments.php b/comments.php
index 525a93d..7cf2a98 100644
--- a/comments.php
+++ b/comments.php
@@ -66,7 +66,16 @@
 
 	endif; // Check for have_comments().
 
-	comment_form();
+	comment_form( array(
+		'class_submit' 			=> 'uk-button uk-button-primary',
+		'comment_field'     => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" class="uk-width-1-1" name="comment" cols="45" rows="8" maxlength="65525" required="required"></textarea></p>',
+		'fields' 						=> array(
+														'author' => '<p class="comment-form-author uk">' . '<label for="author">' . __( 'Name' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . '<input id="author" class="uk-width-1-1" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" /></p>',
+														'email' => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . '<input id="email" class="uk-width-1-1" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" /></p>',
+														'url' => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label>' . '<input id="url" class="uk-width-1-1" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
+													),
+		'submit_button'     => '<input name="%1$s" type="submit" id="%2$s" class="%3$s" value="%4$s" />',
+	));
 	?>
 
 </div><!-- #comments -->
diff --git a/functions.php b/functions.php
index fff09d1..bf54112 100644
--- a/functions.php
+++ b/functions.php
@@ -216,3 +216,8 @@ function teamwpugph_scripts() {
 if ( defined( 'JETPACK__VERSION' ) ) {
 	require get_template_directory() . '/inc/jetpack.php';
 }
+
+/**
+ * Custom Walker Comment
+ */
+require get_template_directory() . '/inc/class-teamwpugph-comments.php';
\ No newline at end of file
diff --git a/inc/class-teamwpugph-comments.php b/inc/class-teamwpugph-comments.php
new file mode 100644
index 0000000..cac8b12
--- /dev/null
+++ b/inc/class-teamwpugph-comments.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * ThemeWPUGPH Comments
+ * 
+ * @package ThemeWPUGPH
+ */
+
+if ( ! class_exists( 'ThemeWPUGPH_Comments' ) ) :
+  class ThemeWPUGPH_Comments extends Walker_Comment {
+
+	/**
+	 * Outputs a comment in the HTML5 format.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @see wp_list_comments()
+	 *
+	 * @param WP_Comment $comment Comment to display.
+	 * @param int        $depth   Depth of the current comment.
+	 * @param array      $args    An array of arguments.
+	 */
+	protected function html5_comment( $comment, $depth, $args ) {
+		$tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
+
+		$commenter = wp_get_current_commenter();
+		if ( $commenter['comment_author_email'] ) {
+			$moderation_note = __( 'Your comment is awaiting moderation.' );
+		} else {
+			$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' );
+		}
+
+		?>
+		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
+
+			<article  id="div-comment-<?php comment_ID(); ?>" class="uk-comment">
+				<header class="uk-comment-header uk-grid-medium uk-flex-middle" uk-grid>
+						<div class="uk-width-auto">
+							<?php
+								if ( 0 != $args['avatar_size'] ) {
+									echo get_avatar( $comment, $args['avatar_size'] );}
+							?>
+						</div>
+						<div class="uk-width-expand">
+								<h4 class="uk-comment-title uk-margin-remove">
+									<!-- <a class="uk-link-reset" href="#">Author</a> -->
+									<?php
+										/* translators: %s: comment author link */
+										printf(
+											sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
+										);
+									?>
+								</h4>
+								<ul class="uk-comment-meta uk-subnav uk-subnav-divider uk-margin-remove-top">
+										<li>
+											<a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
+												<time datetime="<?php comment_time( 'c' ); ?>">
+													<?php
+														/* translators: 1: comment date, 2: comment time */
+														printf( __( '%1$s at %2$s' ), get_comment_date( '', $comment ), get_comment_time() );
+													?>
+												</time>
+											</a>
+										</li>
+										<li>
+											<ul class="uk-subnav uk-subnav-line">
+												<?php
+													comment_reply_link(
+														array_merge(
+															$args,
+															array(
+																'add_below' => 'div-comment',
+																'depth'     => $depth,
+																'max_depth' => $args['max_depth'],
+																'before'    => '<li>',
+																'after'     => '</li>',
+															)
+														)
+													);
+													?>			
+												</ul>
+										</li>
+								</ul>
+						</div>
+				</header>
+				<div class="uk-comment-body">
+				<?php comment_text(); ?>
+				</div>
+			</article>
+
+
+			
+		<?php
+	}    
+      
+  }
+endif; 
\ No newline at end of file