diff --git a/app/models/host.rb b/app/models/host.rb
index 848151c..478ff9a 100644
--- a/app/models/host.rb
+++ b/app/models/host.rb
@@ -1,63 +1,67 @@
 class Host < ActiveRecord::Base
   FILE_RETENTION_DAYS = 60
   JOB_RETENTION_DAYS = 180
   CATALOG = 'MyCatalog'
   AUTOPRUNE = 1
 
   establish_connection :local_development
 
   enum status: { draft: 0, pending: 1, config: 2, ready: 3 }
 
   belongs_to :client, class_name: :Client, foreign_key: :name, primary_key: :name
   has_many :filesets, dependent: :destroy
 
   validates :file_retention, :job_retention,
     :port, :password, presence: true
   validates :port, numericality: true
 
   validates :name, presence: true, uniqueness: true
 
   validate :fqdn_format
 
   scope :not_baculized, -> { where(baculized: false) }
 
   before_validation :set_retention, :unset_baculized, :sanitize_name
 
   def to_bacula_config_array
     [
       "Client {",
       "  Name = #{name}",
       "  Address = #{fqdn}",
       "  FDPort = #{port}",
       "  Catalog = #{CATALOG}",
       "  Password = \"#{password}\"",
       "  File Retention = #{file_retention} days",
       "  Job Retention = #{job_retention} days",
       "  AutoPrune = yes",
       "}"
     ]
   end
 
+  def auto_prune_human
+    AUTOPRUNE == 1 ? 'yes' : 'no'
+  end
+
   private
 
   def sanitize_name
     self.name = fqdn
   end
 
   def set_retention
     self.file_retention = FILE_RETENTION_DAYS
     self.job_retention = JOB_RETENTION_DAYS
   end
 
   def unset_baculized
     self.baculized = false if new_record?
     true
   end
 
   def fqdn_format
     regex = /(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)/
     unless fqdn =~ regex
       self.errors.add(:fqdn)
     end
   end
 end
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index ff6dbba..14cbb40 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -1,27 +1,50 @@
 <div class="row right">
   <%= link_to 'New Client', new_host_path, class: 'btn btn-primary', role: 'button' %>
 </div>
 
-<h1>My Hosts</h1>
+<h1>My Bacula Clients</h1>
 
 <div class="table-responsive">
   <table class="table table-striped table-bordered table-condensed">
     <thead>
       <tr>
         <th>Name</th>
         <th>Uname</th>
         <th>Active Jobs</th>
         <th>Last Backup</th>
         <th>FileRetention (days)</th>
         <th>JobRetention (days)</th>
         <th>Space Used</th>
         <th>File count</th>
         <th>AutoPrune</th>
       </tr>
     </thead>
 
     <tbody>
       <%= render partial: 'client', collection: @clients %>
     </tbody>
   </table>
 </div>
+
+<h1>My Pending Hosts</h1>
+
+<div class="table-responsive">
+  <table class="table table-striped table-bordered table-condensed">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>FQDN</th>
+        <th>Port</th>
+        <th>Password</th>
+        <th>FileRetention (days)</th>
+        <th>JobRetention (days)</th>
+        <th>AutoPrune</th>
+        <th>Created At</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <%= render partial: 'hosts/host', collection: @hosts %>
+    </tbody>
+  </table>
+</div>
diff --git a/app/views/hosts/_form.html.erb b/app/views/hosts/_form.html.erb
index 9558c57..203fa17 100644
--- a/app/views/hosts/_form.html.erb
+++ b/app/views/hosts/_form.html.erb
@@ -1,13 +1,12 @@
 <%= bootstrap_form_for(@host) do |f| %>
   <div>
-  <%= f.text_field :name %>
+  <%= f.text_field :fqdn %>
   <%= f.text_field :password %>
   <%= f.number_field :port %>
-  <%= f.text_field :fqdn %>
   </div>
 
 
   <div class="actions">
     <%= f.submit %>
   </div>
 <% end %>
diff --git a/app/views/hosts/_host.html.erb b/app/views/hosts/_host.html.erb
new file mode 100644
index 0000000..dceaa4a
--- /dev/null
+++ b/app/views/hosts/_host.html.erb
@@ -0,0 +1,10 @@
+<tr>
+  <td><%= link_to host.name, host_path(host) %></td>
+  <td><%= host.fqdn %></td>
+  <td><%= host.port %></td>
+  <td><%= host.password %></td>
+  <td><%= host.file_retention %></td>
+  <td><%= host.job_retention %></td>
+  <td><%= host.auto_prune_human %></td>
+  <td><%= I18n.l(host.created_at, format: :long) %></td>
+</tr>
diff --git a/app/views/hosts/show.html.erb b/app/views/hosts/show.html.erb
new file mode 100644
index 0000000..2bb738d
--- /dev/null
+++ b/app/views/hosts/show.html.erb
@@ -0,0 +1,47 @@
+<p id="notice"><%= notice %></p>
+
+<div class="table-responsive">
+  <table class="table table-striped table-bordered table-condensed">
+    <tr>
+      <td>Name</td>
+      <td><%= @host.name %></td>
+    </tr>
+    <tr>
+      <td>FQDN</td>
+      <td><%= @host.fqdn %></td>
+    </tr>
+    <tr>
+      <td>FDPort</td>
+      <td><%= @host.port %></td>
+    </tr>
+    <tr>
+      <td>Password</td>
+      <td><%= @host.password %></td>
+    </tr>
+    <tr>
+      <td>File Retention</td>
+      <td><%= @host.file_retention %> days</td>
+    </tr>
+    <tr>
+      <td>Job Retention</td>
+      <td><%= @host.job_retention %> days</td>
+    </tr>
+    <tr>
+      <td>Auto Prune</td>
+      <td><%= @host.auto_prune_human %></td>
+    </tr>
+    <tr>
+      <td>Created</td>
+      <td><%= I18n.l(@host.created_at, format: :long) %></td>
+    </tr>
+  </table>
+</div>
+
+<div>
+  <%= link_to 'Edit', edit_host_path(@host), class: "btn btn-primary", role: "button" %>
+  <%= link_to 'Submit Backup Policy', '#', class: "btn btn-success", role: "button" %>
+  <%= link_to 'Remove host', host_path(@host), method: :delete, class: "btn btn-danger", role: "button" %>
+</div>
+<br/>
+
+<%= link_to 'Back to clients', clients_path %>