diff --git a/modules/file/file.css b/modules/file/file.css
index aed1a9d..ac29fb5 100644
--- a/modules/file/file.css
+++ b/modules/file/file.css
@@ -20,7 +20,7 @@
 }
 
 .form-managed-file div.ajax-progress div {
-  display: inline;
+  display: block;
 }
 
 .form-managed-file div.ajax-progress-bar {
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index 2af3cb6..693fda1 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -440,6 +440,8 @@ function file_field_widget_settings_form($field, $instance) {
  * Implements hook_field_widget_form().
  */
 function file_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
+  $widget = $instance['widget'];
+  $settings = $widget['settings'];
 
   $defaults = array(
     'fid' => 0,
@@ -482,6 +484,7 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco
     '#upload_validators' => file_field_widget_upload_validators($field, $instance),
     '#value_callback' => 'file_field_widget_value',
     '#process' => array_merge($element_info['#process'], array('file_field_widget_process')),
+    '#progress_indicator' => $settings['progress_indicator'],
     // Allows this field to return an array instead of a single value.
     '#extended' => TRUE,
   );
diff --git a/modules/file/file.module b/modules/file/file.module
index 3e45251..0e8d6c3 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -45,7 +45,6 @@ function file_menu() {
   );
   $items['file/progress'] = array(
     'page callback' => 'file_ajax_progress',
-    'delivery callback' => 'ajax_deliver',
     'access arguments' => array('access content'),
     'theme callback' => 'ajax_base_page_theme',
     'type' => MENU_CALLBACK,
@@ -409,6 +408,7 @@ function file_managed_file_process($element, &$form_state, $form) {
         '#type' => 'hidden',
         '#value' => $upload_progress_key,
         '#attributes' => array('class' => array('file-progress')),
+        '#weight' => -20,
       );
     }
     elseif ($implementation == 'apc') {
@@ -416,6 +416,7 @@ function file_managed_file_process($element, &$form_state, $form) {
         '#type' => 'hidden',
         '#value' => $upload_progress_key,
         '#attributes' => array('class' => array('file-progress')),
+        '#weight' => -20,
       );
     }