diff --git a/index.php b/index.php
index cddf2b6421..037f13bb5c 100644
--- a/index.php
+++ b/index.php
@@ -89,19 +89,16 @@ require('./wp-blog-header.php');
  <li id="calendar">
 	<?php get_calendar(); ?>
  </li>
- <li id="other"><?php _e('Other:'); ?>
-	<ul>
-		<li><a href="<?php echo get_settings('siteurl'); ?>/wp-login.php"><?php _e('Login'); ?></a></li>
-		<li><a href="<?php echo get_settings('siteurl'); ?>/wp-register.php"><?php _e('Register'); ?></a></li>
-	</ul>
- </li>
  <li id="meta"><?php _e('Meta:'); ?>
  	<ul>
+		<li><?php wp_register(); ?></li>
+		<li><?php wp_loginout(); ?></li>
 		<li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php _e('Syndicate this site using RSS'); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
 		<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('The latest comments to all posts in RSS'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
 		<li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
 		<li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li>
 		<li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>"><abbr title="WordPress">WP</abbr></a></li>
+		<?php wp_meta(); ?>
 	</ul>
  </li>
 
diff --git a/wp-admin/templates.php b/wp-admin/templates.php
index 762456a794..8444dc4fed 100644
--- a/wp-admin/templates.php
+++ b/wp-admin/templates.php
@@ -130,7 +130,7 @@ default:
 	if (!$error) {
 	?> 
   <form name="template" action="templates.php" method="post"> 
-     <textarea cols="80" rows="21" style="width:98%; font-family: 'Courier New', Courier, monopace; font-size:small;" name="newcontent" tabindex="1"><?php echo $content ?></textarea> 
+     <textarea cols="80" rows="21" style="width:95%; margin-right: 10em; font-family: 'Courier New', Courier, monopace; font-size:small;" name="newcontent" tabindex="1"><?php echo $content ?></textarea> 
      <input type="hidden" name="action" value="update" /> 
      <input type="hidden" name="file" value="<?php echo $file ?>" /> 
      <p class="submit">
diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php
index 0b290f0f81..26c08894a8 100644
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -2,6 +2,37 @@
 
 /* Note: these tags go anywhere in the template */
 
+function wp_loginout() {
+	global $user_level;
+	get_currentuserinfo();
+
+	if (0 == $user_level) :
+		$link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
+	else :
+		$link = '<a href="' . get_settings('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
+	endif;
+
+	echo apply_filters('loginout', $link);
+}
+
+function wp_register() {
+	global $user_level;
+
+	get_currentuserinfo();
+
+	if (0 == $user_level) :
+		$link = '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>';
+	else :
+		$link = '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>';
+	endif;
+
+	echo apply_filters('register', $link);
+}
+
+function wp_meta() {
+	do_action('wp_meta', 1);
+}
+
 function bloginfo($show='') {
     $info = get_bloginfo($show);
     $info = apply_filters('bloginfo', $info);