diff --git a/pages/viewmachine.php b/pages/viewmachine.php
index f99600e..07daea4 100644
--- a/pages/viewmachine.php
+++ b/pages/viewmachine.php
@@ -44,45 +44,82 @@ $machine = new Machine($machineid);
             <div class="col-sm-6 mb-3">
                 <h6>Device Info:</h6>
                 <div class="list-group">
-                    <div class="list-group-item">
-                        <b><?php $Strings->get("OS/Software"); ?></b>: <?php echo htmlspecialchars($machine->getOS()); ?>
-                    </div>
-                    <div class="list-group-item">
-                        <b><?php $Strings->get("Serial"); ?></b>: <?php echo htmlspecialchars($machine->getSerial()); ?>
-                    </div>
-                    <div class="list-group-item">
-                        <b><?php $Strings->get("Manufacturer"); ?></b>: <?php echo htmlspecialchars($machine->getManufacturer()); ?>
-                    </div>
-                    <div class="list-group-item">
-                        <b><?php $Strings->get("Model"); ?></b>: <?php echo htmlspecialchars($machine->getModel()); ?>
-                    </div>
-                    <div class="list-group-item">
-                        <b><?php $Strings->get("Condition"); ?></b>: <?php
-                        $val = $machine->getCondition();
-                        $filled = floor($val);
-                        $empty = 10;
-                        while ($filled > 0) {
-                            $filled--;
-                            $empty--;
-                            echo "<i class=\"fas fa-star\"></i> ";
-                        }
-                        if ($val - floor($val) > 0.75) {
-                            $empty--;
-                            echo "<i class=\"fas fa-star\"></i> ";
-                        } else if ($val - floor($val) > 0.25) {
-                            $empty--;
-                            echo "<i class=\"fas fa-star-half-alt\"></i> ";
-                        }
-                        while ($empty > 0) {
-                            $empty--;
-                            echo "<i class=\"far fa-star\"></i> ";
-                        }
-                        echo " ($val/10)";
+                    <?php
+                    if (!empty($machine->getClientID())) {
+                        $client = Clients::getClient($machine->getClientID());
                         ?>
-                    </div>
-                    <div class="list-group-item">
-                        <b><?php $Strings->get("Price"); ?></b>: $<?php echo number_format($machine->getPrice(), 2); ?>
-                    </div>
+                        <div class="list-group-item">
+                            <b><?php $Strings->get("Client"); ?></b>: <?php echo htmlspecialchars($client->getName()); ?>
+                            <br />
+                            <div class="ml-3">
+                                <?php if (!empty($client->getPhone())) { ?>
+                                    <b>Phone:</b> <?php echo $client->getPhone(); ?>
+                                    <br />
+                                <?php } ?>
+                                <?php if (!empty($client->getBillingAddress())) { ?>
+                                    <b>Billing address:</b><br><?php echo str_replace("\n", "\n<br>", htmlspecialchars($client->getBillingAddress())); ?>
+                                    <br />
+                                <?php } ?>
+                                <?php if (!empty($client->getMailingAddress())) { ?>
+                                    <b>Mailing address:</b><br><?php echo str_replace("\n", "\n<br>", htmlspecialchars($client->getMailingAddress())); ?>
+                                <?php } ?>
+                                <br />
+                            </div>
+                        </div>
+                        <?php
+                    }
+                    ?>
+                    <?php if (!empty($machine->getOS())) { ?>
+                        <div class="list-group-item">
+                            <b><?php $Strings->get("OS/Software"); ?></b>: <?php echo htmlspecialchars($machine->getOS()); ?>
+                        </div>
+                    <?php } ?>
+                    <?php if (!empty($machine->getSerial())) { ?>
+                        <div class="list-group-item">
+                            <b><?php $Strings->get("Serial"); ?></b>: <?php echo htmlspecialchars($machine->getSerial()); ?>
+                        </div>
+                    <?php } ?>
+                    <?php if (!empty($machine->getManufacturer())) { ?>
+                        <div class="list-group-item">
+                            <b><?php $Strings->get("Manufacturer"); ?></b>: <?php echo htmlspecialchars($machine->getManufacturer()); ?>
+                        </div>
+                    <?php } ?>
+                    <?php if (!empty($machine->getModel())) { ?>
+                        <div class="list-group-item">
+                            <b><?php $Strings->get("Model"); ?></b>: <?php echo htmlspecialchars($machine->getModel()); ?>
+                        </div>
+                    <?php } ?>
+                    <?php if (!empty($machine->getCondition())) { ?>
+                        <div class="list-group-item">
+                            <b><?php $Strings->get("Condition"); ?></b>: <?php
+                            $val = $machine->getCondition();
+                            $filled = floor($val);
+                            $empty = 10;
+                            while ($filled > 0) {
+                                $filled--;
+                                $empty--;
+                                echo "<i class=\"fas fa-star\"></i> ";
+                            }
+                            if ($val - floor($val) > 0.75) {
+                                $empty--;
+                                echo "<i class=\"fas fa-star\"></i> ";
+                            } else if ($val - floor($val) > 0.25) {
+                                $empty--;
+                                echo "<i class=\"fas fa-star-half-alt\"></i> ";
+                            }
+                            while ($empty > 0) {
+                                $empty--;
+                                echo "<i class=\"far fa-star\"></i> ";
+                            }
+                            echo " ($val/10)";
+                            ?>
+                        </div>
+                    <?php } ?>
+                    <?php if (!empty($machine->getPrice())) { ?>
+                        <div class="list-group-item">
+                            <b><?php $Strings->get("Price"); ?></b>: $<?php echo number_format($machine->getPrice(), 2); ?>
+                        </div>
+                    <?php } ?>
                     <?php
                     if (!empty($machine->getPrivateNotes())) {
                         ?>