diff --git a/push-syndication-server/push-syndication-server.php b/push-syndication-server/push-syndication-server.php
index 44fad7933ed6986b6a8a4a7f2ec7fc6293de43e5..ae9b978ea501e89a680a8338caf9755b09d9a44a 100644
--- a/push-syndication-server/push-syndication-server.php
+++ b/push-syndication-server/push-syndication-server.php
@@ -413,23 +413,38 @@ class Push_Syndication_Server {
 		$selected_siteoptions = !empty( $selected_siteoptions ) ? $selected_siteoptions : array() ;
 
 		$site_options = wp_load_alloptions();
+		$chunked_arrays = array_chunk( $site_options, 5, true );
 
-		foreach( $site_options as $key => $value  ) {
+		echo '<table border="1">';
+		echo '<tbody>';
+
+		foreach( $chunked_arrays as $chunked_array ) {
+
+			echo '<tr>';
+
+			foreach( $chunked_array as $key => $value ) {
 
 			if( $key[0] == '_' )
 				continue;
 
 ?>
-		<p>
-			<label>
-				<input type="checkbox" name="syn_selected_siteoptions[]" value="<?php echo esc_html( $key ); ?>" <?php $this->checked_array( $key, $selected_siteoptions ) ?> />
-				<?php echo esc_html( $key ); ?>
-			</label>
-		</p>
+				<td>
+					<label>
+						<input type="checkbox" name="syn_selected_siteoptions[]" value="<?php echo esc_html( $key ); ?>" <?php $this->checked_array( $key, $selected_siteoptions ) ?> />
+						<?php echo esc_html( $key ); ?>
+					</label>
+				</td>
 <?php
 
+			}
+
+			echo '</tr>';
+
 		}
 
+		echo '</tbody';
+		echo '</table>';
+
 	}
 
 	/*******  SYNCING OPTIONS  *******/