diff --git a/answers.features.content.inc b/answers.features.content.inc
index 6569ef5..fddc19d 100644
--- a/answers.features.content.inc
+++ b/answers.features.content.inc
@@ -11,18 +11,18 @@ function answers_content_default_fields() {
     'field_name' => 'field_answer_question',
     'type_name' => 'answer',
     'display_settings' => array(
-      'weight' => '31',
+      'weight' => '4',
       'parent' => '',
       'label' => array(
-        'format' => 'above',
+        'format' => 'inline',
       ),
       'teaser' => array(
         'format' => 'default',
-        'exclude' => 1,
+        'exclude' => 0,
       ),
       'full' => array(
         'format' => 'default',
-        'exclude' => 1,
+        'exclude' => 0,
       ),
       '4' => array(
         'format' => 'default',
@@ -75,7 +75,7 @@ function answers_content_default_fields() {
       ),
       'fallback' => 'page_not_found',
       'edit_fallback' => 0,
-      'label' => 'Question',
+      'label' => 'Answer to the question',
       'weight' => '4',
       'description' => '',
       'type' => 'nodereference_url',
@@ -248,8 +248,8 @@ function answers_content_default_fields() {
   // Translatables
   // Included for use with string extractors like potx.
   t('Answer Count');
+  t('Answer to the question');
   t('Notify on Answer');
-  t('Question');
   t('Question Locked');
 
   return $fields;
diff --git a/answers.module b/answers.module
index e662cc3..a4105ec 100644
--- a/answers.module
+++ b/answers.module
@@ -196,7 +196,15 @@ function answers_field_access($op, $field, $account, $node = NULL) {
     return !empty($account->uid);
   }
   // Lock field used programatically.
-  elseif ($field['field_name'] == 'field_question_locked_p') {
+  if ($field['field_name'] == 'field_question_locked_p') {
     return FALSE;
   }
+  // Hide links to the answer node in places such as the question_answers view,
+  // which uses the full build mode to display answers.
+  if ($field['field_name'] == 'field_answer_question') {
+    $node = menu_get_object('node');
+    if ($node->type != 'answer') {
+      return FALSE;
+    }
+  }
 }