diff --git a/admin/options/config.php b/admin/options/config.php
new file mode 100644
index 00000000..aed263d6
--- /dev/null
+++ b/admin/options/config.php
@@ -0,0 +1,175 @@
+<?php
+	$args = array(
+		'post_type' => 'sp_column',
+		'numberposts' => -1,
+		'posts_per_page' => -1,
+			'orderby' => 'menu_order',
+			'order' => 'ASC'
+	);
+	$data = get_posts( $args );
+?>
+<h3 class="title"><?php _e( 'Table Columns', 'sportspress' ); ?></h3>
+<table class="widefat">
+	<thead>
+		<tr>
+			<th><?php _e( 'Label', 'sportspress' ); ?></th>
+			<th><?php _e( 'Equation', 'sportspress' ); ?></th>
+			<th><?php _e( 'Sort Order', 'sportspress' ); ?></th>
+		</tr>
+	</thead>
+	<?php $i = 0; foreach ( $data as $row ): ?>
+		<tr>
+			<td class="row-title"><?php echo $row->post_title; ?></td>
+			<td>
+				<?php
+					$equation = get_post_meta ( $row->ID, 'sp_equation', true );
+					if ( $equation ):
+						echo str_replace(
+							array( '$', '+', '-', '*', '/' ),
+							array( '', '&plus;', '&minus;', '&times;', '&divide' ),
+							$equation
+						);
+					else:
+						echo '—';
+					endif;
+				?>
+			</td>
+			<td>
+				<?php
+					$priority = get_post_meta ( $row->ID, 'sp_priority', true );
+					if ( $priority ):
+						echo $priority . ' ' . str_replace(
+							array( 'DESC', 'ASC' ),
+							array( '&darr;', '&uarr;' ),
+							get_post_meta ( $row->ID, 'sp_order', true )
+						);
+					else:
+						echo '—';
+					endif;
+				?>
+			</td>
+		</tr>
+	<?php $i++; endforeach; ?>
+	<tfoot>
+		<tr>
+			<th colspan="3"><a href="<?php echo admin_url( 'edit.php?post_type=sp_column' ); ?>"><?php printf( __( 'Edit %s', 'sportspress' ), __( 'Table Columns', 'sportspress' ) ); ?></a></th>
+		</tr>
+	</tfoot>
+</table>
+
+<?php
+	$args = array(
+		'post_type' => 'sp_statistic',
+		'numberposts' => -1,
+		'posts_per_page' => -1,
+			'orderby' => 'menu_order',
+			'order' => 'ASC'
+	);
+	$data = get_posts( $args );
+?>
+<h3 class="title"><?php _e( 'Statistics', 'sportspress' ); ?></h3>
+<table class="widefat">
+	<thead>
+		<tr>
+			<th><?php _e( 'Label', 'sportspress' ); ?></th>
+			<th><?php _e( 'Equation', 'sportspress' ); ?></th>
+			<th><?php _e( 'Sort Order', 'sportspress' ); ?></th>
+		</tr>
+	</thead>
+	<?php $i = 0; foreach ( $data as $row ): ?>
+		<tr>
+			<td class="row-title"><?php echo $row->post_title; ?></td>
+			<td>
+				<?php
+					$equation = get_post_meta ( $row->ID, 'sp_equation', true );
+					if ( $equation ):
+						echo str_replace(
+							array( '$', '+', '-', '*', '/' ),
+							array( '', '&plus;', '&minus;', '&times;', '&divide' ),
+							$equation
+						);
+					else:
+						echo '—';
+					endif;
+				?>
+			</td>
+			<td>
+				<?php
+					$priority = get_post_meta ( $row->ID, 'sp_priority', true );
+					if ( $priority ):
+						echo $priority . ' ' . str_replace(
+							array( 'DESC', 'ASC' ),
+							array( '&darr;', '&uarr;' ),
+							get_post_meta ( $row->ID, 'sp_order', true )
+						);
+					else:
+						echo '—';
+					endif;
+				?>
+			</td>
+		</tr>
+	<?php $i++; endforeach; ?>
+	<tfoot>
+		<tr>
+			<th colspan="3"><a href="<?php echo admin_url( 'edit.php?post_type=sp_column' ); ?>"><?php printf( __( 'Edit %s', 'sportspress' ), __( 'Statistics', 'sportspress' ) ); ?></a></th>
+		</tr>
+	</tfoot>
+</table>
+
+<?php
+	$args = array(
+		'post_type' => 'sp_result',
+		'numberposts' => -1,
+		'posts_per_page' => -1,
+			'orderby' => 'menu_order',
+			'order' => 'ASC'
+	);
+	$data = get_posts( $args );
+?>
+<h3 class="title"><?php _e( 'Results', 'sportspress' ); ?></h3>
+<table class="widefat">
+	<thead>
+		<tr>
+			<th><?php _e( 'Label', 'sportspress' ); ?></th>
+		</tr>
+	</thead>
+	<?php $i = 0; foreach ( $data as $row ): ?>
+		<tr<?php if ( $i % 2 ) echo ' class="alternate"'; ?>>
+			<td class="row-title"><?php echo $row->post_title; ?></td>
+		</tr>
+	<?php $i++; endforeach; ?>
+	<tfoot>
+		<tr>
+			<th><a href="<?php echo admin_url( 'edit.php?post_type=sp_result' ); ?>"><?php printf( __( 'Edit %s', 'sportspress' ), __( 'Results', 'sportspress' ) ); ?></a></th>
+		</tr>
+	</tfoot>
+</table>
+
+<?php
+	$args = array(
+		'post_type' => 'sp_outcome',
+		'numberposts' => -1,
+		'posts_per_page' => -1,
+			'orderby' => 'menu_order',
+			'order' => 'ASC'
+	);
+	$data = get_posts( $args );
+?>
+<h3 class="title"><?php _e( 'Outcomes', 'sportspress' ); ?></h3>
+<table class="widefat">
+	<thead>
+		<tr>
+			<th><?php _e( 'Label', 'sportspress' ); ?></th>
+		</tr>
+	</thead>
+	<?php $i = 0; foreach ( $data as $row ): ?>
+		<tr<?php if ( $i % 2 ) echo ' class="alternate"'; ?>>
+			<td class="row-title"><?php echo $row->post_title; ?></td>
+		</tr>
+	<?php $i++; endforeach; ?>
+	<tfoot>
+		<tr>
+			<th><a href="<?php echo admin_url( 'edit.php?post_type=sp_outcome' ); ?>"><?php printf( __( 'Edit %s', 'sportspress' ), __( 'Outcomes', 'sportspress' ) ); ?></a></th>
+		</tr>
+	</tfoot>
+</table>
\ No newline at end of file
diff --git a/admin/options/general.php b/admin/options/general.php
new file mode 100644
index 00000000..3df6bf58
--- /dev/null
+++ b/admin/options/general.php
@@ -0,0 +1,7 @@
+<?php
+
+	settings_fields( 'sportspress_general' );
+	do_settings_sections( 'sportspress_general' );
+	submit_button();
+
+?>
\ No newline at end of file
diff --git a/sportspress-settings.php b/admin/options/options.php
similarity index 78%
rename from sportspress-settings.php
rename to admin/options/options.php
index 9218d3d6..4405ca9f 100644
--- a/sportspress-settings.php
+++ b/admin/options/options.php
@@ -2,7 +2,7 @@
 function sportspress_admin_menu() {
 
 	add_options_page(
-		__( 'SportsPress Settings', 'sportspress' ),
+		__( 'SportsPress', 'sportspress' ),
 		__( 'SportsPress', 'sportspress' ),
 		'manage_options',
 		'sportspress',
@@ -13,17 +13,26 @@ function sportspress_admin_menu() {
 add_action( 'admin_menu', 'sportspress_admin_menu' );
 
 function sportspress_settings() {
+
+	$active_tab = isset( $_GET[ 'tab' ] ) ? $_GET[ 'tab' ] : 'general';
+
 ?>
 	<div class="wrap">
-	
-		<div id="icon-options-general" class="icon32"></div>
-		<h2><?php _e( 'SportsPress Settings', 'sportspress' ); ?></h2>
+
+		<h2 class="nav-tab-wrapper">
+			<a href="?page=sportspress" class="nav-tab<?php echo $active_tab == 'general' ? ' nav-tab-active' : ''; ?>"><?php _e( 'SportsPress', 'sportspress' ); ?></a>
+			<a href="?page=sportspress&tab=config" class="nav-tab<?php echo $active_tab == 'config' ? ' nav-tab-active' : ''; ?>"><?php _e( 'Configure', 'sportspress' ); ?></a>
+		</h2>
 
 		<form method="post" action="options.php">
 			<?php
-			settings_fields( 'sportspress' );
-			do_settings_sections( 'sportspress' );
-			submit_button();
+				switch ( $active_tab ):
+					case 'config':
+						include 'config.php';
+						break;
+					default:
+						include 'general.php';
+				endswitch;
 			?>
 		</form>
 		
@@ -74,7 +83,7 @@ function sportspress_validate( $input ) {
 function sportspress_register_settings() {
 	
 	register_setting(
-		'sportspress',
+		'sportspress_general',
 		'sportspress',
 		'sportspress_validate'
 	);
@@ -83,14 +92,14 @@ function sportspress_register_settings() {
 		'general',
 		'',
 		'',
-		'sportspress'
+		'sportspress_general'
 	);
 	
 	add_settings_field(	
-		'sport',						
+		'sport',
 		__( 'Sport', 'sportspress' ),
 		'sportspress_sport_callback',	
-		'sportspress',
+		'sportspress_general',
 		'general'
 	);
 	
diff --git a/sportspress-actions.php b/sportspress-actions.php
index 2bcc08e9..c3faa82f 100644
--- a/sportspress-actions.php
+++ b/sportspress-actions.php
@@ -55,11 +55,16 @@ function sp_manage_posts_custom_column( $column, $post_id ) {
 			echo get_post_meta ( $post_id, 'sp_team' ) ? sp_the_posts( $post_id, 'sp_team', '', '<br />', $result, ( empty( $result ) ? ' — ' : ' ' ) ) : '—';
 			break;
 		case 'sp_equation':
-			echo str_replace(
-				array( '$', '+', '-', '*', '/' ),
-				array( '', '&plus;', '&minus;', '&times;', '&divide' ),
-				get_post_meta ( $post_id, 'sp_equation', true )
-			);
+			$equation = get_post_meta ( $post_id, 'sp_equation', true );
+			if ( $equation ):
+				echo str_replace(
+					array( '$', '+', '-', '*', '/' ),
+					array( '', '&plus;', '&minus;', '&times;', '&divide' ),
+					$equation
+				);
+			else:
+				echo '—';
+			endif;
 			break;
 		case 'sp_order':
 			$priority = get_post_meta ( $post_id, 'sp_priority', true );
diff --git a/sportspress.php b/sportspress.php
index e0b1927b..f0d90cb8 100644
--- a/sportspress.php
+++ b/sportspress.php
@@ -31,7 +31,7 @@ include dirname( __FILE__ ) . '/sportspress-globals.php' ;
 require_once dirname( __FILE__ ) . '/sportspress-functions.php';
 
 // Settings
-include dirname( __FILE__ ) . '/sportspress-settings.php' ;
+include dirname( __FILE__ ) . '/admin/options/options.php' ;
 
 // Custom Post Types
 require_once dirname( __FILE__ ) . '/admin/post-types/separator.php';