diff --git a/src/view/wallet/view_model.rs b/src/view/wallet/view_model.rs
index a72d8d2..d330e6f 100644
--- a/src/view/wallet/view_model.rs
+++ b/src/view/wallet/view_model.rs
@@ -43,7 +43,6 @@ pub struct ViewModel {
 
     path: PathBuf,
 
-    #[getter(skip)]
     asset: Option<ContractId>,
 
     #[getter(as_mut)]
diff --git a/src/view/wallet/wallet.glade b/src/view/wallet/wallet.glade
index e5f8fbc..4b67332 100644
--- a/src/view/wallet/wallet.glade
+++ b/src/view/wallet/wallet.glade
@@ -656,13 +656,14 @@
                   <object class="GtkGrid">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="valign">center</property>
+                    <property name="valign">end</property>
                     <property name="margin-top">6</property>
                     <property name="margin-bottom">6</property>
+                    <property name="vexpand">False</property>
                     <property name="column-spacing">12</property>
                     <property name="baseline-row">1</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="value_lbl">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
@@ -685,7 +686,7 @@
                         <property name="halign">start</property>
                         <property name="valign">baseline</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="b_lbl">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="valign">baseline</property>
@@ -737,7 +738,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="s_lbl">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="valign">baseline</property>
@@ -762,7 +763,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSeparator">
+                      <object class="GtkSeparator" id="sep1">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                       </object>
@@ -772,7 +773,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkBox" id="fiat_box">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
@@ -853,7 +854,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSeparator">
+                      <object class="GtkSeparator" id="sep2">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                       </object>
@@ -864,7 +865,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkBox" id="price_box">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
@@ -918,7 +919,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="price_lbl">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
@@ -938,6 +939,8 @@
                       <object class="GtkBox" id="contract_box">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
+                        <property name="valign">end</property>
+                        <property name="vexpand">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel">
@@ -977,7 +980,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="fiat_lbl">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
diff --git a/src/view/wallet/widget.rs b/src/view/wallet/widget.rs
index ab06e3d..b46c574 100644
--- a/src/view/wallet/widget.rs
+++ b/src/view/wallet/widget.rs
@@ -22,8 +22,8 @@ use gtk::gdk_pixbuf::Pixbuf;
 use gtk::prelude::*;
 use gtk::{
     gdk, Adjustment, ApplicationWindow, Button, CheckButton, Entry, HeaderBar, Image, Label,
-    ListBox, ListStore, Menu, MenuItem, Popover, RadioMenuItem, SortColumn, SortType, SpinButton,
-    Spinner, Statusbar, TextBuffer, TreeView,
+    ListBox, ListStore, Menu, MenuItem, Popover, RadioMenuItem, Separator, SortColumn, SortType,
+    SpinButton, Spinner, Statusbar, TextBuffer, TreeView,
 };
 use relm::Relm;
 use wallet::hd::SegmentIndexes;
@@ -82,11 +82,21 @@ pub struct Widgets {
     contract_box: gtk::Box,
     contract_entry: Entry,
 
+    b_lbl: Label,
+    s_lbl: Label,
     balance_btc_lbl: Label,
     balance_sat_lbl: Label,
     balance_fiat_lbl: Label,
     balance_cents_lbl: Label,
 
+    fiat_box: gtk::Box,
+    price_box: gtk::Box,
+    value_lbl: Label,
+    fiat_lbl: Label,
+    price_lbl: Label,
+    sep1: Separator,
+    sep2: Separator,
+
     exchange_lbl: Label,
     fiat_usd: RadioMenuItem,
     fiat_eur: RadioMenuItem,
@@ -454,6 +464,19 @@ impl Widgets {
         let info = model.asset_info();
         self.ticker_lbl.set_text(&info.ticker());
         self.asset_lbl.set_text(&info.name());
+        self.contract_entry.set_text(&info.contract_name());
+
+        let is_asset = model.asset().is_some();
+        self.contract_box.set_visible(is_asset);
+        self.value_lbl.set_visible(!is_asset);
+        self.b_lbl.set_visible(!is_asset);
+        self.s_lbl.set_visible(!is_asset);
+        self.fiat_box.set_visible(!is_asset);
+        self.fiat_lbl.set_visible(!is_asset);
+        self.price_box.set_visible(!is_asset);
+        self.price_lbl.set_visible(!is_asset);
+        self.sep1.set_visible(!is_asset);
+        self.sep2.set_visible(!is_asset);
     }
 
     fn bind_asset_model(&self, model: &AssetModel) {