diff --git a/data/glade/ipod-info.glade b/data/glade/ipod-info.glade
index e9e1014..d49bc9f 100644
--- a/data/glade/ipod-info.glade
+++ b/data/glade/ipod-info.glade
@@ -18,6 +18,7 @@
             <child>
               <widget class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
+                <property name="border_width">12</property>
                 <child>
                   <widget class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
@@ -29,82 +30,82 @@
                         <property name="border_width">12</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
-                        <property name="column_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkProgressBar" id="progressbar-ipod-usage">
+                          <widget class="GtkEntry" id="entry-ipod-owner">
                             <property name="visible">True</property>
-                            <property name="pulse_step">0.10000000149</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">*</property>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label-ipod-usage">
+                          <widget class="GtkEntry" id="entry-ipod-name">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Volume Usage:</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">*</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label-ipod-name">
+                          <widget class="GtkLabel" id="label-ipod-owner">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">iPod Name:</property>
+                            <property name="label" translatable="yes">Your Name:</property>
                           </widget>
                           <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label-ipod-owner">
+                          <widget class="GtkLabel" id="label-ipod-name">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Your Name:</property>
+                            <property name="label" translatable="yes">iPod Name:</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="entry-ipod-name">
+                          <widget class="GtkLabel" id="label-ipod-usage">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">*</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Volume Usage:</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="entry-ipod-owner">
+                          <widget class="GtkProgressBar" id="progressbar-ipod-usage">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">*</property>
+                            <property name="pulse_step">0.10000000149</property>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
@@ -137,56 +138,56 @@
                         <property name="border_width">12</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">2</property>
-                        <property name="column_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkLabel" id="label-number-tracks">
+                          <widget class="GtkLabel" id="label-number-playlist-number">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Number of Tracks:</property>
+                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
                           </widget>
                           <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label-number-playlist">
+                          <widget class="GtkLabel" id="label-number-track-number">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Number of Playlists:</property>
+                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label-number-track-number">
+                          <widget class="GtkLabel" id="label-number-playlist">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                            <property name="label" translatable="yes">Number of Playlists:</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label-number-playlist-number">
+                          <widget class="GtkLabel" id="label-number-tracks">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                            <property name="label" translatable="yes">Number of Tracks:</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
@@ -225,6 +226,7 @@
             <child>
               <widget class="GtkFrame" id="frame2">
                 <property name="visible">True</property>
+                <property name="border_width">12</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
@@ -233,82 +235,65 @@
                     <property name="border_width">12</property>
                     <property name="n_rows">6</property>
                     <property name="n_columns">2</property>
-                    <property name="column_spacing">6</property>
+                    <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <widget class="GtkLabel" id="label-ipod-model-value">
+                      <widget class="GtkLabel" id="label-device-node-value">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label-ipod-mode">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Model:</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-serial-number-value">
+                      <widget class="GtkLabel" id="label-mount-point-value">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-serial-number">
+                      <widget class="GtkLabel" id="label-device-node">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Serial Number:</property>
+                        <property name="label" translatable="yes">Device Node:</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-firmware-version-value">
+                      <widget class="GtkLabel" id="label-mount-point">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Mount Point:</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-firmware-version">
+                      <widget class="GtkLabel" id="label-database-version">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Firmware Version:</property>
+                        <property name="label" translatable="yes">Database Version:</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -327,63 +312,80 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-database-version">
+                      <widget class="GtkLabel" id="label-firmware-version">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Database Version:</property>
+                        <property name="label" translatable="yes">Firmware Version:</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-mount-point">
+                      <widget class="GtkLabel" id="label-firmware-version-value">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Mount Point:</property>
                       </widget>
                       <packing>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-device-node">
+                      <widget class="GtkLabel" id="label-serial-number">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Device Node:</property>
+                        <property name="label" translatable="yes">Serial Number:</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-mount-point-value">
+                      <widget class="GtkLabel" id="label-serial-number-value">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label-device-node-value">
+                      <widget class="GtkLabel" id="label-ipod-mode">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Model:</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label-ipod-model-value">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
diff --git a/plugins/ipod/ipod-ui.xml b/plugins/ipod/ipod-ui.xml
index 55ae2d9..d153815 100644
--- a/plugins/ipod/ipod-ui.xml
+++ b/plugins/ipod/ipod-ui.xml
@@ -1,10 +1,12 @@
 <ui>
   <popup name="iPodSourcePopup">
     <menuitem name="iPodSrcPopupRename" action="iPodSourceRename"/>
-    <menuitem name="iPodSrcPopupEject" action="RemovableSourceEject"/>
-    <menuitem name="iPodSrcPopupProperties" action="iPodProperties"/>
     <separator />
     <menuitem name="iPodSrcPopupPlaylistNew" action="iPodSourcePlaylistNew"/>
+    <separator />
+    <menuitem name="iPodSrcPopupEject" action="RemovableSourceEject"/>
+    <separator />
+    <menuitem name="iPodSrcPopupProperties" action="iPodProperties"/>
   </popup>
   <popup name="iPodPlaylistSourcePopup">
     <menuitem name="iPodPlaylistSrcPopupRename" action="iPodPlaylistSourceRename"/>
diff --git a/plugins/ipod/rb-ipod-plugin.c b/plugins/ipod/rb-ipod-plugin.c
index 33e5452..8753ce4 100644
--- a/plugins/ipod/rb-ipod-plugin.c
+++ b/plugins/ipod/rb-ipod-plugin.c
@@ -46,7 +46,7 @@
 #include "rb-file-helpers.h"
 #include "rb-util.h"
 #include "rb-shell.h"
-
+#include "rb-stock-icons.h"
 
 #define RB_TYPE_IPOD_PLUGIN		(rb_ipod_plugin_get_type ())
 #define RB_IPOD_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), RB_TYPE_IPOD_PLUGIN, RBIpodPlugin))
@@ -103,10 +103,10 @@ static GtkActionEntry rb_ipod_plugin_actions [] =
 	{ "iPodSourceRename", NULL, N_("_Rename"), NULL,
 	  N_("Rename iPod"),
 	  G_CALLBACK (rb_ipod_plugin_cmd_rename) },
-	{ "iPodProperties", NULL, N_("_Properties"), NULL,
+	{ "iPodProperties", GTK_STOCK_PROPERTIES, N_("_Properties"), NULL,
 	  N_("Display iPod properties"),
 	  G_CALLBACK (rb_ipod_plugin_cmd_properties) },
-	{ "iPodSourcePlaylistNew", NULL, N_("_New Playlist"), NULL,
+	{ "iPodSourcePlaylistNew", RB_STOCK_PLAYLIST_NEW, N_("_New Playlist"), NULL,
 	  N_("Add new playlist to iPod"),
 	  G_CALLBACK (rb_ipod_plugin_cmd_playlist_new) },
 	{ "iPodPlaylistSourceRename", NULL, N_("_Rename"), NULL,
diff --git a/plugins/ipod/rb-ipod-source.c b/plugins/ipod/rb-ipod-source.c
index 516b648..ec750dc 100644
--- a/plugins/ipod/rb-ipod-source.c
+++ b/plugins/ipod/rb-ipod-source.c
@@ -1765,26 +1765,16 @@ static guint64 get_fs_property (const char *mountpoint, const char *attr)
         return value;
 }
 
-static double
+static guint64
 get_ipod_capacity (const char *mountpoint)
 {
-        guint64 capacity;
-
-        capacity = get_fs_property (mountpoint,
-                                    G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
-	capacity = (capacity/(1024.0*1024.0));
-	return (double)capacity;
+        return  get_fs_property (mountpoint, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
 }
 
-static double
+static guint64
 get_ipod_free_space (const char *mountpoint)
 {
-	guint64 free;
-	free = get_fs_property (mountpoint, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
-
-	free = (free/(1024.0*1024.0));
-
-	return (double)free;
+	return get_fs_property (mountpoint, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
 }
 
 static char *
@@ -1812,7 +1802,8 @@ rb_ipod_source_show_properties (RBiPodSource *source)
 	GtkWidget *label;
 	char *text;
 	const gchar *mp;
-	double free, capacity;
+	char *used;
+	char *capacity;
  	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
 	Itdb_Device *ipod_dev;
 
@@ -1855,19 +1846,15 @@ rb_ipod_source_show_properties (RBiPodSource *source)
  	gtk_label_set_text (GTK_LABEL (label), mp);
 
 	label = glade_xml_get_widget (xml, "progressbar-ipod-usage");
-	free = get_ipod_free_space(mp);
-	capacity = get_ipod_capacity(mp);
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (label), ((capacity-free)/capacity));
-
-	if(capacity >= 95000.0) {
-		free = free/1024;
-		capacity = capacity/1024;
-		text = g_strdup_printf("%.1f of %.1f GB", (capacity-free), capacity);
-	} else {
-		text = g_strdup_printf("%.0f of %.0f MB", (capacity-free), capacity);
-	}
+	used = g_format_size_for_display (get_ipod_capacity (mp) - get_ipod_free_space (mp));
+	capacity = g_format_size_for_display (get_ipod_capacity(mp));
+	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (label), 
+				       (double)(get_ipod_capacity (mp) - get_ipod_free_space (mp))/(double)get_ipod_capacity (mp));
+	text = g_strdup_printf("%s of %s", used, capacity);
 	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (label), text);
 	g_free (text);
+	g_free (capacity);
+	g_free (used);
 
 	label = glade_xml_get_widget (xml, "label-device-node-value");
 	text = get_ipod_device (source);
