--- src/sysinfo.cpp
+++ src/sysinfo.cpp
@@ -222,7 +222,7 @@
       GError *error = 0;
       int status;
 
-      if (g_spawn_command_line_sync("lsb_release -irc",
+      if (g_spawn_command_line_sync("lsb_release -drc",
 				    &out,
 				    0,
 				    &status,
@@ -234,7 +234,7 @@
 	    and this->get_value(input, release)
 	    and this->get_value(input, codename);
 	  this->distro_release = release;
-	  if (codename != "")
+	  if (codename != "" && codename != "n/a")
 	    this->distro_release += " (" + codename + ')';
 	}
       }
@@ -386,7 +386,7 @@
   gtk_frame_set_shadow_type(GTK_FRAME(distro_frame), GTK_SHADOW_NONE);
   gtk_box_pack_start(GTK_BOX(vbox), distro_frame, FALSE, FALSE, 0);
   alignment = gtk_alignment_new(0.5, 0.5, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 12, 0);
+  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 32, 0);
   gtk_container_add(GTK_CONTAINER(distro_frame), alignment);
 
   GtkWidget* distro_box = gtk_hbox_new(FALSE, 12);
@@ -434,7 +434,7 @@
   gtk_box_pack_start(GTK_BOX(vbox), hardware_frame, FALSE, FALSE, 0);
 
   alignment = gtk_alignment_new(0.5, 0.5, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 12, 0);
+  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 32, 0);
   gtk_container_add(GTK_CONTAINER(hardware_frame), alignment);
 
   hardware_table = gtk_table_new(data->processors.size(), 2, FALSE);
@@ -500,7 +500,7 @@
   gtk_box_pack_start(GTK_BOX(vbox), disk_space_frame, FALSE, FALSE, 0);
 
   alignment = gtk_alignment_new(0.5, 0.5, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 12, 0);
+  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 32, 0);
   gtk_container_add(GTK_CONTAINER(disk_space_frame), alignment);
 
   disk_space_table = gtk_table_new(1, 2, FALSE);