diff --git a/pods/core_feeds/list.php b/pods/core_feeds/list.php
index 4b781d1..bf8c7e1 100644
--- a/pods/core_feeds/list.php
+++ b/pods/core_feeds/list.php
@@ -137,23 +137,11 @@
 	
 	$description = "$scope $type " . implode(" and ",$conditions);
 	$feedurl = $POD->siteRoot(false) . '/feeds/' . $_GET['args'];
+
 	$POD->header($description,$feedurl);
-	?>
-	
-	<div class="column_8">
-		<? $docs->output('short','header','pager',$description); ?>
-	</div>	
-	<div class="column_4 structure_only">
-		<? $POD->output('sidebars/search'); ?>
-		
-		<? $POD->output('sidebars/ad_unit'); ?>
 
-		<? $POD->output('sidebars/tag_cloud'); ?>
+	$docs->output('short','2col_header','2col_pager',$description); 
 
-		<? $POD->output('sidebars/recent_visitors'); ?>
-		
-	</div>	
-<?		
 	$POD->footer();
 
 ?>
\ No newline at end of file
diff --git a/pods/core_groups/index.php b/pods/core_groups/index.php
index 277e293..18e56a8 100644
--- a/pods/core_groups/index.php
+++ b/pods/core_groups/index.php
@@ -65,17 +65,6 @@
 	
 	$POD->header('My Groups');
 	
-	?>
-	<div class="column_8">	
-		<? $groups->output('short','header','pager',$header,'No groups have been created'); ?>
-	</div>
+	$groups->output('short','2col_header','groups_pager',$header,'No groups have been created');
 
-	<div class="column_4 structure_only">
-	
-		<? $POD->output('sidebars/group_search'); ?>
-		<? $POD->output('sidebars/create_group'); ?>
-		<? $POD->output('sidebars/recent_groups'); ?>
-		
-	</div>
-		
-<?	$POD->footer(); ?>
+	$POD->footer(); ?>
diff --git a/pods/core_invite/index.php b/pods/core_invite/index.php
index 479067c..e458c69 100644
--- a/pods/core_invite/index.php
+++ b/pods/core_invite/index.php
@@ -32,39 +32,5 @@
 	}
 		
 	$POD->header('Send Invites');	
-	?>
-	<form method="post" action="<? $POD->siteRoot(); ?>/invite" class="valid" id="invite">
-		
-	
-	<div class="column_6">
-	
-				<h1>Send Invites</h1>
-
-			<p class="normal_input"><label for="email1">Email:</label><input name="email1" id="email1" class="text required validate-email" /></p>
-			<p class="normal_input"><label for="email2">Email:</label><input name="email2" id="email2" class="text  validate-email"  /></p>
-			<p class="normal_input"><label for="email3">Email:</label><input name="email3" id="email3" class="text  validate-email"  /></p>
-			<p class="normal_input"><label for="email4">Email:</label><input name="email4" id="email4" class="text  validate-email"  /></p>
-			<p class="normal_input"><label for="email5">Email:</label><input name="email5" id="email5" class="text  validate-email"  /></p>
-
-		
-	</div>
-	<div class="column_6">
-		<?	if (isset($_GET['group'])) { 
-					$group = $POD->getGroup(array('id'=>$_GET['group']));
-					if ($group->success() && $group->isMember($POD->currentUser())) {	?>
-						<div class="info">
-							Your email will include an invitation to join <? $group->permalink(); ?>.
-						</div>
-						<input type="hidden" name="group" value="<? $group->write('id'); ?>" />
-					<?	} // if group loaded
-				} // if group id passed			
-			?>
-
-		<label for="message">Include a personal message</label>
-		<p class="normal_input"><textarea name="message" id="message" class="text required"></textarea></p>
-		
-		<p class="input"><input type="submit" value="Send Invites &#187;" /></p>
-	</div>
-
-	</form>		
-<?	$POD->footer(); ?>
+	$POD->output('groups/invite');
+	$POD->footer(); ?>
diff --git a/pods/core_usercontent/list.php b/pods/core_usercontent/list.php
index 2626397..b2b04a9 100644
--- a/pods/core_usercontent/list.php
+++ b/pods/core_usercontent/list.php
@@ -26,21 +26,9 @@
 	}
 	$docs = $POD->getContents(array('type'=>$content_type,'status:!='=>'friends_only'),null,30,$offset);
 	
-	$POD->header('What\'s New?'); ?>
+	$POD->header('What\'s New?');
 
-	<div class="column_8">
-		<? $docs->output('short','header','pager','What\'s New?','Nothing has been posted on this site yet. Wow, it must be brand new!'); ?>
-	</div>	
-	<div class="column_4 structure_only">
-		
-		<? $POD->output('sidebars/search'); ?>
+	$docs->output('short','2col_header','2col_pager','What\'s New?','Nothing has been posted on this site yet. Wow, it must be brand new!'); 
 
-		<? $POD->output('sidebars/ad_unit'); ?>
-
-		<? $POD->output('sidebars/tag_cloud'); ?>
-
-		<? $POD->output('sidebars/recent_visitors'); ?>
-		
-	</div>	
-
-<?	$POD->footer(); ?>
+	$POD->footer();
+?>
diff --git a/themes/default/groups/invite.php b/themes/default/groups/invite.php
new file mode 100644
index 0000000..5422cba
--- /dev/null
+++ b/themes/default/groups/invite.php
@@ -0,0 +1,48 @@
+<?php
+/***********************************************
+* This file is part of PeoplePods
+* (c) xoxco, inc  
+* http://peoplepods.net http://xoxco.com
+*
+* theme/groups/invite.php
+* Used to present group invite form.
+*
+*
+* Documentation for this pod can be found here:
+* http://peoplepods.net/readme/group-object
+/**********************************************/
+?>
+	<form method="post" action="<? $POD->siteRoot(); ?>/invite" class="valid" id="invite">
+		
+	
+	<div class="column_6">
+	
+				<h1>Send Invites</h1>
+
+			<p class="normal_input"><label for="email1">Email:</label><input name="email1" id="email1" class="text required validate-email" /></p>
+			<p class="normal_input"><label for="email2">Email:</label><input name="email2" id="email2" class="text  validate-email"  /></p>
+			<p class="normal_input"><label for="email3">Email:</label><input name="email3" id="email3" class="text  validate-email"  /></p>
+			<p class="normal_input"><label for="email4">Email:</label><input name="email4" id="email4" class="text  validate-email"  /></p>
+			<p class="normal_input"><label for="email5">Email:</label><input name="email5" id="email5" class="text  validate-email"  /></p>
+
+		
+	</div>
+	<div class="column_6">
+		<?	if (isset($_GET['group'])) { 
+					$group = $POD->getGroup(array('id'=>$_GET['group']));
+					if ($group->success() && $group->isMember($POD->currentUser())) {	?>
+						<div class="info">
+							Your email will include an invitation to join <? $group->permalink(); ?>.
+						</div>
+						<input type="hidden" name="group" value="<? $group->write('id'); ?>" />
+					<?	} // if group loaded
+				} // if group id passed			
+			?>
+
+		<label for="message">Include a personal message</label>
+		<p class="normal_input"><textarea name="message" id="message" class="text required"></textarea></p>
+		
+		<p class="input"><input type="submit" value="Send Invites &#187;" /></p>
+	</div>
+
+	</form>	
\ No newline at end of file
diff --git a/themes/default/stacks/2col_footer.php b/themes/default/stacks/2col_footer.php
new file mode 100644
index 0000000..f6b345e
--- /dev/null
+++ b/themes/default/stacks/2col_footer.php
@@ -0,0 +1,38 @@
+<?php
+/***********************************************
+* This file is part of PeoplePods
+* (c) xoxco, inc  
+* http://peoplepods.net http://xoxco.com
+*
+* theme/stacks/uc_pager.php
+* Footer template for core_usercontent stack
+* which includes next/previous navigation
+*
+* Documentation for this pod can be found here:
+* http://peoplepods.net/readme/stack-output
+/**********************************************/
+?>	
+	<? if ($this->count() == 0) { ?>
+			<li class="empty_list">
+				<? if ($empty_message) {
+					echo $empty_message; 
+				} else { ?>
+				Nothing to show!
+				<? } ?>
+			</li>
+		<? } ?>
+	</ul>
+	</section>
+</div>
+
+<div class="column_4 structure_only">
+	
+	<? $POD->output('sidebars/search'); ?>
+
+	<? $POD->output('sidebars/ad_unit'); ?>
+
+	<? $POD->output('sidebars/tag_cloud'); ?>
+
+	<? $POD->output('sidebars/recent_visitors'); ?>
+	
+</div>	
\ No newline at end of file
diff --git a/themes/default/stacks/2col_header.php b/themes/default/stacks/2col_header.php
new file mode 100644
index 0000000..88b2a66
--- /dev/null
+++ b/themes/default/stacks/2col_header.php
@@ -0,0 +1,26 @@
+<?php
+/***********************************************
+* This file is part of PeoplePods
+* (c) xoxco, inc  
+* http://peoplepods.net http://xoxco.com
+*
+* theme/stacks/uc_header.php
+* Wrap usercontent stack output from
+* core_usercontent
+*
+* Documentation for this pod can be found here:
+* http://peoplepods.net/readme/stack-output
+/**********************************************/
+?>
+<div class="column_8">
+
+	<section class="stack_output <? if ($title) {?>stack_<?  echo $POD->tokenize($title); } ?>">
+		<ul>
+			<? if ($title) { ?>
+				<li>
+					<header>
+						<h1><?= $title; ?></h1>
+					</header>
+				</li>
+			<? } ?>
+			
\ No newline at end of file
diff --git a/themes/default/stacks/2col_pager.php b/themes/default/stacks/2col_pager.php
new file mode 100644
index 0000000..7107006
--- /dev/null
+++ b/themes/default/stacks/2col_pager.php
@@ -0,0 +1,42 @@
+<?php
+/***********************************************
+* This file is part of PeoplePods
+* (c) xoxco, inc  
+* http://peoplepods.net http://xoxco.com
+*
+* theme/stacks/uc_pager.php
+* Footer template for core_usercontent stack
+* which includes next/previous navigation
+*
+* Documentation for this pod can be found here:
+* http://peoplepods.net/readme/stack-output
+/**********************************************/
+?>	
+	<? if ($this->count() == 0) { ?>
+			<li class="empty_list">
+				<? if ($empty_message) {
+					echo $empty_message; 
+				} else { ?>
+				Nothing to show!
+				<? } ?>
+			</li>
+		<? } ?>
+		<li class="stack_footer pager">
+			<? if ($this->hasPreviousPage()) { echo '<a href="?offset=' . $this->previousPage() . $additional_parameters . '" class="previous">Previous</a>'; } ?>
+			<? if ($this->hasNextPage()) { echo '<a href="?offset=' . $this->nextPage() . $additional_parameters . '" class="next">Next</a>'; }	?>
+		</li>
+	</ul>
+	</section>
+</div>
+
+<div class="column_4 structure_only">
+	
+	<? $POD->output('sidebars/search'); ?>
+
+	<? $POD->output('sidebars/ad_unit'); ?>
+
+	<? $POD->output('sidebars/tag_cloud'); ?>
+
+	<? $POD->output('sidebars/recent_visitors'); ?>
+	
+</div>	
\ No newline at end of file
diff --git a/themes/default/stacks/groups_footer.php b/themes/default/stacks/groups_footer.php
deleted file mode 100644
index 6892095..0000000
--- a/themes/default/stacks/groups_footer.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/***********************************************
-* This file is part of PeoplePods
-* (c) xoxco, inc  
-* http://peoplepods.net http://xoxco.com
-*
-* theme/stacks/groups_footer.php
-* Header used in core_groups to create the /groups page
-*
-* Documentation for this pod can be found here:
-* http://peoplepods.net/readme/stack-output
-/**********************************************/
-?>	
-<? if ($this->count() == 0) { ?>
-		<li class="empty_list">
-			<? if ($empty_message) {
-				echo $empty_message; 
-			} else { ?>
-				No groups found.
-			<? } ?>
-		</li>
-	<? } ?>
-	<li class="stack_footer pager">
-		<? if ($this->hasPreviousPage()) { echo '<a href="?offset=' . $this->previousPage() . $additional_parameters . '" class="previous">Previous</a>'; } ?>
-		<? if ($this->hasNextPage()) { echo '<a href="?offset=' . $this->nextPage() . $additional_parameters . '" class="next">Next</a>'; }	?>
-	</li>
-</ul>
-</section>
\ No newline at end of file
diff --git a/themes/default/stacks/groups_header.php b/themes/default/stacks/groups_header.php
deleted file mode 100644
index 6b27f2c..0000000
--- a/themes/default/stacks/groups_header.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/***********************************************
-* This file is part of PeoplePods
-* (c) xoxco, inc  
-* http://peoplepods.net http://xoxco.com
-*
-* theme/stacks/groups_header.php
-* Header used in core_groups to create the /groups page
-*
-* Documentation for this pod can be found here:
-* http://peoplepods.net/readme/stack-output
-/**********************************************/
-?>	
-
-<section class="stack_output <? if ($title) {?>stack_<?  echo $POD->tokenize($title); } ?>">
-<ul id="group_list">
-	<? if ($this->count() > 0) { ?>	
-		<header>
-			<label class="group_name">Group</label>
-			<label class="group_description">Description</label>
-			<label class="group_list">Members</label>
-		</header>
-	<? } ?>
\ No newline at end of file
diff --git a/themes/default/stacks/groups_pager.php b/themes/default/stacks/groups_pager.php
new file mode 100644
index 0000000..0a30058
--- /dev/null
+++ b/themes/default/stacks/groups_pager.php
@@ -0,0 +1,38 @@
+<?php
+/***********************************************
+* This file is part of PeoplePods
+* (c) xoxco, inc  
+* http://peoplepods.net http://xoxco.com
+*
+* theme/stacks/uc_pager.php
+* Footer template for core_usercontent stack
+* which includes next/previous navigation
+*
+* Documentation for this pod can be found here:
+* http://peoplepods.net/readme/stack-output
+/**********************************************/
+?>	
+	<? if ($this->count() == 0) { ?>
+			<li class="empty_list">
+				<? if ($empty_message) {
+					echo $empty_message; 
+				} else { ?>
+					No groups found.
+				<? } ?>
+			</li>
+		<? } ?>
+		<li class="stack_footer pager">
+			<? if ($this->hasPreviousPage()) { echo '<a href="?offset=' . $this->previousPage() . $additional_parameters . '" class="previous">Previous</a>'; } ?>
+			<? if ($this->hasNextPage()) { echo '<a href="?offset=' . $this->nextPage() . $additional_parameters . '" class="next">Next</a>'; }	?>
+		</li>
+	</ul>
+	</section>
+</div>
+
+<div class="column_4 structure_only">
+	
+	<? $POD->output('sidebars/group_search'); ?>
+	<? $POD->output('sidebars/create_group'); ?>
+	<? $POD->output('sidebars/recent_groups'); ?>
+	
+</div>	
\ No newline at end of file