Binary files imagefield/.DS_Store and imagefield_new/.DS_Store differ
diff -urNp imagefield/imagefield.css imagefield_new/imagefield.css
--- imagefield/imagefield.css	2006-07-07 07:41:01.000000000 +0200
+++ imagefield/imagefield.css	2006-11-30 22:52:02.000000000 +0100
@@ -1,20 +1,32 @@
-div.imagefield-edit-image-row { 
-  border-bottom: 1px solid black;
+div.imagefield-edit-image-row {
+  border: 1px solid #e5e5e5;
+  padding: 5px;
+  margin-bottom: 10px;
 }
 
 div.imagefield-edit-preview img {
-  border: 1px solid black;
+  border: 1px solid #d3e7f4;
 }
 
 div.imagefield-edit-preview  {
-  display: inline;
   float: left;
-  width: 165px;
 }
 
 div.imagefield-edit-image-replace { 
-  font-weight: bold;
-  color: red;
+  font-size: .9em;
+}
+
+div.imagefield-edit-image-detail input.form-text {
+  width: 100%;
+}
+
+div.imagefield-edit-image-detail {
+  margin-left: 180px;
+  margin-right: 20px;
+}
+
+div.imagefield-edit-image-flags div.form-item {
+	float: right;
 }
 
 
diff -urNp imagefield/imagefield.module imagefield_new/imagefield.module
--- imagefield/imagefield.module	2006-11-30 06:09:40.000000000 +0100
+++ imagefield_new/imagefield.module	2006-11-30 22:31:36.000000000 +0100
@@ -466,7 +466,7 @@ function _imagefield_widget_form($node, 
       //drupal_set_message('imagefield['. $fieldname .'] '. $op .' node field: <pre>'. print_r($node_field, true) .'</pre>');
         $form[$fieldname][$delta]['description'] = array(
           '#type' => 'markup',
-          '#value' => '<p>'. t('filename:') . $file['filename']. '</p>',
+          '#value' => '<strong>' . t('Filename: ') . '</strong>' . $file['filename'],
         );
 
         $form[$fieldname][$delta]['alt'] = array(
@@ -477,7 +477,7 @@ function _imagefield_widget_form($node, 
         if ($field['widget']['custom_alt']) {
           $form[$fieldname][$delta]['alt'] = array(
             '#type' => 'textfield',
-            '#title' =>  t('alternate text'),
+            '#title' =>  t('Alternate text'),
             '#default_value' => $file['alt'],
             '#description' => t('Alternate text to be displayed if the image cannot be displayed.'),
             '#maxlength' => 255,
@@ -493,7 +493,7 @@ function _imagefield_widget_form($node, 
         if ($field['widget']['custom_title']) {
           $form[$fieldname][$delta]['title'] = array(
             '#type' => 'textfield',
-            '#title' =>  t('title'),
+            '#title' =>  t('Title'),
             '#default_value' =>  $file['title'],
             '#description' => t('Text to be displayed on mouse overs.'),
             '#maxlength' => 255,
@@ -582,7 +582,7 @@ function _imagefield_file_load($fid = NU
 }
 
 function theme_imagefield_image_preview($file, $alt ='', $title='', $attributes = NULL, $getsize= TRUE) {
-  return '<span class="imagefield-image-preview">'. theme('imagefield_image', $file, $alt, $title, $attributes , $getsize) .'</span>';
+  return  theme('imagefield_image', $file, $alt, $title, $attributes , $getsize);
 }
 
 function theme_imagefield_view_image($file, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
@@ -593,16 +593,18 @@ function theme_imagefield_view_image($fi
 
 function theme_imagefield_edit_image_row($element) {
   $output = '<div class="imagefield-edit-preview">'. drupal_render($element['preview']) .'</div>';
-  $output .= '<div class="imagefield-edit-image-description">'. drupal_render($element['description']) .'</div>';
+  $output .= '<div class="imagefield-edit-image-detail">';
+  $output .= '<div class="imagefield-edit-image-flags">'. drupal_render($element['flags']) .'</div>';
+  $output .= '<div class="imagefield-edit-image-description">'. drupal_render($element['description']);
+  $output .= '</div>';
+  $output .= drupal_render($element['alt']);
+  $output .= drupal_render($element['title']);
+  $output .= '</div>';
   //$output .= '<div class="imagefield-edit-image-fid">'. $element['fid']['#value'] .'</div>';
+  $output = '<div class="imagefield-edit-image-row clear-block">'. $output .'</div>';
   if (isset($element['replace'])) {
     $output .= '<div class="imagefield-edit-image-replace">'. drupal_render($element['replace']) .'</div>';
   }
-  $output .= '<div class="imagefield-edit-image-flags">'. drupal_render($element['flags']) .'</div>';
-  $output .= '<div style="clear:both">&nbsp;</div>';
-  $output .= '<div class="imagefield-edit-image-alt">'.drupal_render($element['alt']).'</div>';
-  $output .= '<div class="imagefield-edit-image-title">'.drupal_render($element['title']).'</div>';
-  $output = '<div class="imagefield-edit-image-row">'. $output .'</div>';
   return $output;  
 }