diff --git a/NumberSearch.Mvc/Views/Lookup/Index.cshtml b/NumberSearch.Mvc/Views/Lookup/Index.cshtml
index ed58a94d..4f2f38c9 100644
--- a/NumberSearch.Mvc/Views/Lookup/Index.cshtml
+++ b/NumberSearch.Mvc/Views/Lookup/Index.cshtml
@@ -24,23 +24,20 @@
         </div>
     </div>
 </section>
-<div class="bg-light pt-5 pb-5">
+<div class="bg-light pt-3 pb-3">
     <div class="container">
         <div class="row">
             <div class="col-md-6">
                 <p>🚀 Enter multiple phone numbers, we will hunt down any information we can find for each phone number and check if we can port the phone number to our network.</p>
                 <p>🔮 We check to see who the underlying telecom provider is and when the phone number was last transferred between telecom providers.</p>
-                <p>🔬 Find out how your caller ID displays on other people's phones!</p>
+                <p class="m-md-0">🔬 Find out how your caller ID displays on other people's phones!</p>
             </div>
             <div class="offset-xl-2 offset-lg-1"></div>
             <div class="col">
                 <form class="justify-content-center">
                     <div class="form-group">
                         <div class="input-group input-group-lg">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text">+1</span>
-                            </div>
-                            <textarea class="form-control" aria-label="With textarea" type="text" name="dialedNumber" placeholder="200 Numbers per Search" style="height:8rem;">@Model?.DialedNumber</textarea>
+                            <textarea class="form-control" aria-label="With textarea" type="text" name="dialedNumber" placeholder="Up to 200 Numbers per Search" style="height:8rem;">@Model?.DialedNumber</textarea>
                         </div>
                         <div class="input-group mx-auto input-group-lg pt-2">
                             <button type="submit" class="btn btn-lg btn-success btn-block" onclick="displayBusyIndicator(this)" asp-controller="Lookup" asp-action="BulkPort">Search</button>
@@ -68,8 +65,8 @@
     }
     if (Model != null && Model?.Lookups != null && Model.Lookups.Any())
     {
-        <div class="container">
-            <div class="pb-3">
+        <div class="pt-3">
+            <div class="container">
                 <div class="table-responsive shadow-sm mb-4">
                     <table class="table table-striped table-hover table-borderless" id="investigated">
                         <thead>
@@ -77,16 +74,19 @@
                                 <th>
                                     Phone Number
                                 </th>
-                                <th>
+                                <th class="d-sm-none">
+                                    Related Info
+                                </th>
+                                <th class="d-none d-sm-table-cell">
                                     Last Port Date
                                 </th>
-                                <th>
+                                <th class="d-none d-sm-table-cell">
                                     Caller Name
                                 </th>
-                                <th>
+                                <th class="d-none d-lg-table-cell">
                                     Local Routing #
                                 </th>
-                                <th>
+                                <th class="d-none d-md-table-cell">
                                     Carrier
                                 </th>
                             </tr>
@@ -97,21 +97,41 @@
                                 {
                                     <tr>
                                         <td>
-                                            <h4>@number?.tn</h4>
+                                            <h4>@number?.tn
+                                            
+                                            </h4>
+                                            <p class="d-lg-none m-0">
+                                                Local Routing #
+                                            </p>
+                                            <h6 class="d-lg-none m-0">@number?.lrn</h6>
                                         </td>
                                         <td>
                                             @number?.LastPorted
+                                            <p class="d-sm-none">        
+                                                @number?.LIDBName
+                                                -
+                                                @number?.spid      
+                                                @number?.lec
+                                                -
+                                                @number?.lectype
+                                            </p>
                                         </td>
-                                        <td>
+                                        <td class="d-none d-sm-table-cell">
                                             @number?.LIDBName
+                                            <p class="d-md-none">
+                                                -
+                                                @number?.spid
+                                                @number?.lec
+                                                -
+                                                @number?.lectype
+                                            </p>
                                         </td>
-                                        <td>
+                                        <td class="d-none d-lg-table-cell">
                                             <h4>@number?.lrn</h4>
                                         </td>
-                                        <td>
+                                        <td class="d-none d-md-table-cell">
                                             <p>
                                                 @number?.spid
-                                                -
                                                 @number?.lec
                                                 -
                                                 @number?.lectype
@@ -132,7 +152,7 @@
             <div class="pb-3">
                 <div class="row mt-3">
                     <div class="col">
-                        <div class="btn-group-lg">
+                        <div class="btn-group">
                             @if (Model?.Portable is not null && Model.Portable.Any())
                             {
                                 <a class="btn btn-success text-light" href="#portable">@Model.Portable.Count() Local Numbers</a>
@@ -150,7 +170,7 @@
                 </div>
                 <div class="row">
                     <div class="col-12">
-                        <h1 class="display-2" id="notportable">Not Portable</h1>
+                        <h1 class="pt-1 pb-1" id="notportable">Not Portable</h1>
                     </div>
                     <div class="col-12">
                         <div class="alert alert-danger" role="alert">
@@ -159,7 +179,7 @@
                     </div>
                 </div>
                 <div class="table-responsive shadow-sm">
-                    <table class="table table-striped table-borderless table-hover">
+                    <table class="table table-striped table-borderless table-hover m-0">
                         <tbody>
                             @if (Model?.NotPortable is not null)
                             {
@@ -184,10 +204,9 @@
     if (Model != null && Model?.Portable != null && Model.Portable.Any())
     {
         <div class="container">
-            <div class="pb-3">
                 <div class="row mt-3">
                     <div class="col">
-                        <div class="btn-group-lg">
+                        <div class="btn-group">
                             @if (Model?.Portable is not null && Model.Portable.Any())
                             {
                                 <a class="btn btn-success text-light" href="#portable">@Model.Portable.Count() Local Numbers</a>
@@ -205,7 +224,7 @@
                 </div>
                 <div class="row">
                     <div class="col-12">
-                        <h1 class="display-2" id="portable">Local Numbers</h1>
+                        <h1 class="pt-1 pb-1" id="portable">Local Numbers</h1>
                     </div>
                     <div class="col-12">
                         <div class="alert alert-success" role="alert">
@@ -213,8 +232,8 @@
                         </div>
                     </div>
                 </div>
-                <div class="table-responsive shadow-sm mb-4">
-                    <table class="table table-striped table-borderless table-hover">
+                <div class="table-responsive shadow-sm">
+                    <table class="table table-striped table-borderless table-hover m-0">
                         <tbody>
                             <tr>
                                 <th>
@@ -238,7 +257,6 @@
                                 <th class="hidden">LEC</th>
                                 <th>
                                     <button class="btn btn-outline-info" onclick="showHidden()">All Info</button>
-
                                 </th>
                             </tr>
                             @if (Model?.Portable is not null)
@@ -330,7 +348,6 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
         </div>
     }
     if (Model != null && Model?.Wireless != null && Model.Wireless.Any())
@@ -339,7 +356,7 @@
             <div class="pb-3">
                 <div class="row mt-3">
                     <div class="col">
-                        <div class="btn-group-lg">
+                        <div class="btn-group">
                             @if (Model?.Portable is not null && Model.Portable.Any())
                             {
                                 <a class="btn btn-success text-light" href="#portable">@Model.Portable.Count() Local Numbers</a>
@@ -355,12 +372,12 @@
                         </div>
                     </div>
                 </div>
-                <h1 class="display-2" id="wireless">Wireless Numbers</h1>
+                <h1 class="pt-1 pb-1" id="wireless">Wireless Numbers</h1>
                 <div class="alert alert-warning col-12" role="alert">
                     These <strong>wireless</strong> phone numbers can be ported to our network!
                 </div>
-                <div class="table-responsive shadow-sm pb-4">
-                    <table class="table table-striped table-borderless table-hover">
+                <div class="table-responsive shadow-sm">
+                    <table class="table table-striped table-borderless table-hover m-0">
                         <tbody>
                             <tr>
                                 <th>
@@ -478,7 +495,7 @@
                 </div>
                 <div class="row mt-3">
                     <div class="col">
-                        <div class="btn-group-lg">
+                        <div class="btn-group">
                             @if (Model?.Portable is not null && Model.Portable.Any())
                             {
                                 <a class="btn btn-success text-light" href="#portable">@Model.Portable.Count() Local Numbers</a>
diff --git a/NumberSearch.Mvc/Views/Search/Index.cshtml b/NumberSearch.Mvc/Views/Search/Index.cshtml
index 29814cec..815c32e1 100644
--- a/NumberSearch.Mvc/Views/Search/Index.cshtml
+++ b/NumberSearch.Mvc/Views/Search/Index.cshtml
@@ -36,13 +36,13 @@
         </div>
     </div>
 </section>
-<div class="bg-light pt-5 pb-5">
+<div class="bg-light pt-3 pb-3">
     <div class="container">
         <div class="row">
             <div class="col-md-6">
                 <p>🌎 To search by area code, enter the area code and press search.</p>
                 <p>💼 To bring your number with you, enter the 10 digit number and press search.</p>
-                <p>🛠️ For advanced search, use * to pad your search, for example ***word to search for a number containing word, but exclude the area code.</p>
+                <p class="m-md-0">🛠️ For advanced search, use * to pad your search, for example ***word to search for a number containing word, but exclude the area code.</p>
             </div>
             <div class="offset-xl-2 offset-lg-1"></div>
             <div class="col">
@@ -69,21 +69,23 @@
 @{
     if (!string.IsNullOrWhiteSpace(Model?.Message))
     {
-        <div class="container">
-            <div class="row pt-3 pb-3">
-                @if (string.IsNullOrWhiteSpace(Model?.AlertType))
-                {
-                    <div class="alert alert-danger col-12" role="alert">
-                        @Model?.Message
-                    </div>
-                }
-                else
-                {
-                    var alertType = Model?.AlertType ?? "alert-danger";
-                    <div class="alert @alertType col-12" role="alert">
-                        @Model?.Message
-                    </div>
-                }
+        <div class="pb-3 pt-3">
+            <div class="container">
+                <div class="row">
+                    @if (string.IsNullOrWhiteSpace(Model?.AlertType))
+                    {
+                        <div class="alert alert-danger col-12" role="alert">
+                            @Model?.Message
+                        </div>
+                    }
+                    else
+                    {
+                        var alertType = Model?.AlertType ?? "alert-danger";
+                        <div class="alert @alertType col-12" role="alert">
+                            @Model?.Message
+                        </div>
+                    }
+                </div>
             </div>
         </div>
     }
@@ -93,340 +95,355 @@
         var pageResultsCount = Model.Page * 50;
 
         var total = $"{Model?.NumberOfResults} available numbers found!";
-        <div class="container">
-            <div class="row pt-3 pb-3">
-                @if (Model?.CleanQuery is not null && Model?.Query is not null && Model.CleanQuery.Length == 10 && Model.Query.Length == 3)
-                {
-                    <div class="alert alert-info col-12" role="alert">
-                        Area code @Model.CleanQuery.Substring(0, 3) detected.
+        <div class="pt-3">
+            <div class="container">
+                <div class="row">
+                    <div class="col">
+                        @if (Model?.CleanQuery is not null && Model?.Query is not null && Model.CleanQuery.Length == 10 && Model.Query.Length == 3)
+                        {
+                            <div class="alert alert-info col-12" role="alert">
+                                Area code @Model.CleanQuery.Substring(0, 3) detected.
+                            </div>
+                        }
+                        <div class="alert alert-success col-12" role="alert">
+                            @total
+                        </div>
                     </div>
-                }
-                <div class="alert alert-success col-12" role="alert">
-                    @total
                 </div>
-                <form action="/Search" class="col-12 pr-0 pl-0 pt-2 pb-3">
-                    <div class="btn-group btn-group-toggle" data-toggle="buttons">
-                        @{
-                            if (Model?.View == "Sequential")
-                            {
-                                <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Recommended&Page=@Model.Page">Recommended</a>
-                                <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Sequential&Page=@Model.Page">Sequential</a>
-                                <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Location&Page=@Model.Page">Location</a>
-                                <script type="text/javascript">
-                                    // Handles issue #124 on Github
-                                    // https://github.com/AccelerateNetworks/NumberSearch/issues/124
-                                    $(document).ready(function () {
-                                        numbers = $("tr");
-                                        last = numbers[0];
-                                        blockColors = ["table-secondary", "table-default "];
-                                        flag = true;
-                                        lastArr = last.className.split(" ");
-                                        if (lastArr.indexOf(blockColors[0]) == -1) {
-                                            last.className += " " + blockColors[0];
-                                        }
-                                        for (x = 1; x < numbers.length; x++) {
-                                            if (parseInt(numbers[x].id) != parseInt(last.id) + 1) {
-                                                flag = !flag;
-
+            </div>
+        </div>
+        <div class="container">
+            <div class="row">
+                <div class="col">
+                    <form action="/Search">
+                        <div class="btn-group btn-group-toggle pb-1 pb-md-3" data-toggle="buttons">
+                            @{
+                                if (Model?.View == "Sequential")
+                                {
+                                    <a class="btn btn-outline-secondary disabled d-none d-md-block" disabled>Filter by</a>
+                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Recommended&Page=@Model.Page">Recommended</a>
+                                    <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Sequential&Page=@Model.Page">Sequential</a>
+                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Location&Page=@Model.Page">Location</a>
+                                    <script type="text/javascript">
+                                        // Handles issue #124 on Github
+                                        // https://github.com/AccelerateNetworks/NumberSearch/issues/124
+                                        $(document).ready(function () {
+                                            numbers = $("tr");
+                                            last = numbers[0];
+                                            blockColors = ["table-secondary", "table-default "];
+                                            flag = true;
+                                            lastArr = last.className.split(" ");
+                                            if (lastArr.indexOf(blockColors[0]) == -1) {
+                                                last.className += " " + blockColors[0];
                                             }
-                                            if (flag) {
-                                                currentClassArr = numbers[x].className.split(" ");
-                                                if (currentClassArr.indexOf(blockColors[0]) == -1) {
-                                                    numbers[x].className += " " + blockColors[0];
+                                            for (x = 1; x < numbers.length; x++) {
+                                                if (parseInt(numbers[x].id) != parseInt(last.id) + 1) {
+                                                    flag = !flag;
+
                                                 }
-                                            }
-                                            else {
-                                                currentClassArr = numbers[x].className.split(" ");
-                                                if (currentClassArr.indexOf(blockColors[1]) == -1) {
-                                                    numbers[x].className += " " + blockColors[1];
+                                                if (flag) {
+                                                    currentClassArr = numbers[x].className.split(" ");
+                                                    if (currentClassArr.indexOf(blockColors[0]) == -1) {
+                                                        numbers[x].className += " " + blockColors[0];
+                                                    }
+                                                }
+                                                else {
+                                                    currentClassArr = numbers[x].className.split(" ");
+                                                    if (currentClassArr.indexOf(blockColors[1]) == -1) {
+                                                        numbers[x].className += " " + blockColors[1];
+                                                    }
                                                 }
-                                            }
 
-                                            last = numbers[x];
-                                        }
-                                    });
-                                </script>
-                            }
-                            else if (Model?.View == "Location")
-                            {
-                                if (string.IsNullOrWhiteSpace(Model?.City))
+                                                last = numbers[x];
+                                            }
+                                        });
+                                    </script>
+                                }
+                                else if (Model?.View == "Location")
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Recommended&Page=@Model?.Page">Recommended</a>
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Sequential&Page=@Model?.Page">Sequential</a>
-                                    <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Location&Page=@Model?.Page">Location</a>
+                                    if (string.IsNullOrWhiteSpace(Model?.City))
+                                    {
+                                        <a class="btn btn-outline-secondary disabled d-none d-md-block" disabled>Filter by</a>
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Recommended&Page=@Model?.Page">Recommended</a>
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Sequential&Page=@Model?.Page">Sequential</a>
+                                        <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Location&Page=@Model?.Page">Location</a>
+                                    }
+                                    else
+                                    {
+                                        <a class="btn btn-outline-secondary disabled d-none d-md-block" disabled>Filter by</a>
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=Recommended&Page=@Model.Page">Recommended</a>
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=Sequential&Page=@Model.Page">Sequential</a>
+                                        <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=Location&Page=@Model.Page">Location</a>
+                                    }
                                 }
                                 else
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=Recommended&Page=@Model.Page">Recommended</a>
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=Sequential&Page=@Model.Page">Sequential</a>
-                                    <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=Location&Page=@Model.Page">Location</a>
+                                    <a class="btn btn-outline-secondary disabled d-none d-md-block" disabled>Filter by</a>
+                                    <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Recommended&Page=@Model?.Page">Recommended</a>
+                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Sequential&Page=@Model?.Page">Sequential</a>
+                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Location&Page=@Model?.Page">Location</a>
                                 }
                             }
-                            else
-                            {
-                                <a class="btn btn-outline-secondary active" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Recommended&Page=@Model?.Page">Recommended</a>
-                                <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Sequential&Page=@Model?.Page">Sequential</a>
-                                <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=Location&Page=@Model?.Page">Location</a>
-                            }
-                        }
-                    </div>
-                    <div class="btn-group float-right" role="group" aria-label="pagination">
-                        @{
-                            if ((Model?.NumberOfResults % 50) > 1)
-                            {
-                                maxPage += 1;
-                            }
-                            if (Model?.Page > 1)
-                            {
-                                var previousPage = Model.Page - 1;
-                                if (string.IsNullOrWhiteSpace(Model?.City))
-                                {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@previousPage">Previous</a>
-                                }
-                                else
+                        </div>
+                        <div class="btn-group float-right pb-1 pb-md-3" role="group" aria-label="pagination">
+                            @{
+                                if ((Model?.NumberOfResults % 50) > 1)
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model?.City&View=@Model?.View&Page=@previousPage">Previous</a>
+                                    maxPage += 1;
                                 }
-                                <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
-                            }
-                            else
-                            {
-                                <a class="btn btn-outline-secondary disabled">Previous</a>
-                                <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
-                            }
-                            if (Model?.NumberOfResults > pageResultsCount)
-                            {
-                                var nextPage = Model.Page + 1;
-                                if (string.IsNullOrWhiteSpace(Model?.City))
+                                if (Model?.Page > 1)
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@nextPage">Next</a>
+                                    var previousPage = Model.Page - 1;
+                                    if (string.IsNullOrWhiteSpace(Model?.City))
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@previousPage">Previous</a>
+                                    }
+                                    else
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model?.City&View=@Model?.View&Page=@previousPage">Previous</a>
+                                    }
+                                    <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
                                 }
                                 else
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=@Model.View&Page=@nextPage">Next</a>
+                                    <a class="btn btn-outline-secondary disabled d-none d-md-block">Previous</a>
+                                    <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
                                 }
-                            }
-                            else
-                            {
-                                <a class="btn btn-outline-secondary disabled">Next</a>
-                            }
-                        }
-                    </div>
-                </form>
-                @if (Model?.View == "Location")
-                {
-                    <p>Filter by City</p>
-                    <div class="mb-3">
-                        @if (Model?.Cities is not null)
-                        {
-                            foreach (var city in Model.Cities)
-                            {
-                                if (city == Model?.City)
+                                if (Model?.NumberOfResults > pageResultsCount)
                                 {
-                                    <div class="btn-group">
-                                        <a class="btn btn-outline-info active mb-1" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@city&View=Location&Page=@Model.Page">@city</a>
-                                        <a class="btn btn-outline-danger mb-1" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Location&Page=@Model.Page">Remove</a>
-                                    </div>
+                                    var nextPage = Model.Page + 1;
+                                    if (string.IsNullOrWhiteSpace(Model?.City))
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@nextPage">Next</a>
+                                    }
+                                    else
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=@Model.View&Page=@nextPage">Next</a>
+                                    }
                                 }
                                 else
                                 {
-                                    <a class="btn btn-outline-info mb-1" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&City=@city&View=Location&Page=@Model?.Page">@city</a>
+                                    <a class="btn btn-outline-secondary d-none d-md-block">Next</a>
                                 }
                             }
-                        }
-                    </div>
-                }
-                <div class="table-responsive shadow-sm">
-                    <table class="table table-striped table-borderless table-hover">
-                        <tbody>
-                            @if (Model?.PhoneNumbers is not null)
+                        </div>
+                    </form>
+                    @if (Model?.View == "Location")
+                    {
+                        <div class="pb-md-3 pb-1">
+                            <a class="btn btn-outline-info mb-1 disabled" disabled>Filter by City</a>
+                            @if (Model?.Cities is not null)
                             {
-                                var match = string.Empty;
-                                if (Model.CleanQuery != null && Model.CleanQuery.Contains('*'))
+                                foreach (var city in Model.Cities)
                                 {
-                                    match = Model.CleanQuery.Substring(0, Model.CleanQuery.IndexOf('*'));
-                                }
-                                else
-                                {
-                                    match = Model.CleanQuery;
+                                    if (city == Model?.City)
+                                    {
+                                        <div class="btn-group">
+                                            <a class="btn btn-outline-info active mb-1" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@city&View=Location&Page=@Model.Page">@city</a>
+                                            <a class="btn btn-outline-danger mb-1" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&View=Location&Page=@Model.Page">Remove</a>
+                                        </div>
+                                    }
+                                    else
+                                    {
+                                        <a class="btn btn-outline-info mb-1" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&City=@city&View=Location&Page=@Model?.Page">@city</a>
+                                    }
                                 }
-
-                                foreach (var item in Model.PhoneNumbers)
+                            }
+                        </div>
+                    }
+                    <div class="table-responsive shadow-sm">
+                        <table class="table table-striped table-borderless table-hover">
+                            <tbody>
+                                @if (Model?.PhoneNumbers is not null)
                                 {
-                                    var location = $"{item?.City ?? "Unknown City"}, {item?.State ?? "Unknown State"}";
-                                    var formattedNumber = $"({item?.NPA}) {item?.NXX}-{item?.XXXX.ToString("0000")}";
-                                    var number = item?.DialedNumber;
-
-                                    if (number?.Contains(match!) ?? false)
+                                    var match = string.Empty;
+                                    if (Model.CleanQuery != null && Model.CleanQuery.Contains('*'))
                                     {
-                                        var start = item?.DialedNumber.IndexOf(match!) ?? 0;
-                                        var stop = Model?.CleanQuery?.Length ?? 0;
-                                        var beginning = item?.DialedNumber.Substring(0, start);
-                                        var middle = (start == 0) && (stop == 10) ? Model?.CleanQuery : Model?.Query;
-                                        var end = item?.DialedNumber.Substring(start + stop);
-                                        number = $"{beginning}<b class='text-success'>{middle}</b>{end}";
+                                        match = Model.CleanQuery.Substring(0, Model.CleanQuery.IndexOf('*'));
                                     }
-
-                                    if (alreadyInCart is not null && item?.DialedNumber is not null && alreadyInCart.TryGetValue(item.DialedNumber, out var _))
+                                    else
                                     {
-                                        <tr id="@item.DialedNumber" class="table-success">
-                                            <td class="d-none d-sm-table-cell">
-                                                @{
-                                                    if (item.NumberType == "Standard")
-                                                    {
-                                                        <h4><span class="badge badge-secondary">Standard</span></h4>
-                                                    }
-                                                    else if (item.NumberType == "Premium")
-                                                    {
-                                                        <h4><span class="badge badge-primary">Premium</span></h4>
-                                                    }
-                                                    else if (item.NumberType == "Executive")
-                                                    {
-                                                        <h4><span class="badge badge-success">Executive</span></h4>
-                                                    }
-                                                    else if (item.NumberType == "Tollfree")
-                                                    {
-                                                        <h4><span class="badge badge-dark">Tollfree</span></h4>
-                                                    }
-                                                }
-                                            </td>
-                                            <td scope="row"><h4>@formattedNumber</h4></td>
-                                            <td class="d-none d-sm-table-cell">@Html.Raw(number)</td>
-                                            <td class="d-none d-sm-table-cell">@location</td>
-                                            <td>
-                                                @{
-                                                    if (item.Purchased)
-                                                    {
-                                                        <button class="btn btn-outline-secondary disabled">
-                                                            Already Purchased
-                                                        </button>
-                                                    }
-                                                    else if (alreadyInCart.TryGetValue(item.DialedNumber, out var _))
-                                                    {
-                                                        <button onclick="RemoveFromCart('PhoneNumber', @item.DialedNumber, 1, this)" class="btn btn-outline-danger">
-                                                            <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
-                                                            Remove
-                                                        </button>
-                                                    }
-                                                    else
-                                                    {
-                                                        <button onclick="AddToCart('PhoneNumber', @item.DialedNumber, 1, this)" class="btn btn-outline-primary">
-                                                            <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
-                                                            Add to Cart
-                                                        </button>
-                                                    }
-                                                }
-                                            </td>
-                                        </tr>
+                                        match = Model.CleanQuery;
                                     }
-                                    else
+
+                                    foreach (var item in Model.PhoneNumbers)
                                     {
-                                        <tr id="@item?.DialedNumber">
-                                            <td class="d-none d-sm-table-cell">
-                                                @{
-                                                    if (item?.NumberType == "Standard")
-                                                    {
-                                                        <h4><span class="badge badge-secondary">Standard</span></h4>
-                                                    }
-                                                    else if (item?.NumberType == "Premium")
-                                                    {
-                                                        <h4><span class="badge badge-primary">Premium</span></h4>
-                                                    }
-                                                    else if (item?.NumberType == "Executive")
-                                                    {
-                                                        <h4><span class="badge badge-success">Executive</span></h4>
-                                                    }
-                                                    else if (item?.NumberType == "Tollfree")
-                                                    {
-                                                        <h4><span class="badge badge-dark">Tollfree</span></h4>
+                                        var location = $"{item?.City ?? "Unknown City"}, {item?.State ?? "Unknown State"}";
+                                        var formattedNumber = $"({item?.NPA}) {item?.NXX}-{item?.XXXX.ToString("0000")}";
+                                        var number = item?.DialedNumber;
+
+                                        if (number?.Contains(match!) ?? false)
+                                        {
+                                            var start = item?.DialedNumber.IndexOf(match!) ?? 0;
+                                            var stop = Model?.CleanQuery?.Length ?? 0;
+                                            var beginning = item?.DialedNumber.Substring(0, start);
+                                            var middle = (start == 0) && (stop == 10) ? Model?.CleanQuery : Model?.Query;
+                                            var end = item?.DialedNumber.Substring(start + stop);
+                                            number = $"{beginning}<b class='text-success'>{middle}</b>{end}";
+                                        }
+
+                                        if (alreadyInCart is not null && item?.DialedNumber is not null && alreadyInCart.TryGetValue(item.DialedNumber, out var _))
+                                        {
+                                            <tr id="@item.DialedNumber" class="table-success">
+                                                <td class="d-none d-sm-table-cell">
+                                                    @{
+                                                        if (item.NumberType == "Standard")
+                                                        {
+                                                            <h4><span class="badge badge-secondary">Standard</span></h4>
+                                                        }
+                                                        else if (item.NumberType == "Premium")
+                                                        {
+                                                            <h4><span class="badge badge-primary">Premium</span></h4>
+                                                        }
+                                                        else if (item.NumberType == "Executive")
+                                                        {
+                                                            <h4><span class="badge badge-success">Executive</span></h4>
+                                                        }
+                                                        else if (item.NumberType == "Tollfree")
+                                                        {
+                                                            <h4><span class="badge badge-dark">Tollfree</span></h4>
+                                                        }
                                                     }
-                                                }
-                                            </td>
-                                            <td scope="row"><h4>@formattedNumber</h4></td>
-                                            <td class="d-none d-sm-table-cell">@Html.Raw(number)</td>
-                                            <td class="d-none d-sm-table-cell">@location</td>
-                                            <td>
-                                                @{
-                                                    if (item is not null && item.Purchased)
-                                                    {
-                                                        <button class="btn btn-outline-secondary disabled">
-                                                            Already Purchased
-                                                        </button>
+                                                </td>
+                                                <td scope="row"><h4>@formattedNumber</h4></td>
+                                                <td class="d-none d-sm-table-cell">@Html.Raw(number)</td>
+                                                <td class="d-none d-sm-table-cell">@location</td>
+                                                <td>
+                                                    @{
+                                                        if (item.Purchased)
+                                                        {
+                                                            <button class="btn btn-outline-secondary disabled">
+                                                                Already Purchased
+                                                            </button>
+                                                        }
+                                                        else if (alreadyInCart.TryGetValue(item.DialedNumber, out var _))
+                                                        {
+                                                            <button onclick="RemoveFromCart('PhoneNumber', @item.DialedNumber, 1, this)" class="btn btn-outline-danger">
+                                                                <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
+                                                                Remove
+                                                            </button>
+                                                        }
+                                                        else
+                                                        {
+                                                            <button onclick="AddToCart('PhoneNumber', @item.DialedNumber, 1, this)" class="btn btn-outline-primary">
+                                                                <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
+                                                                Add to Cart
+                                                            </button>
+                                                        }
                                                     }
-                                                    else if (alreadyInCart is not null && item?.DialedNumber is not null && alreadyInCart.TryGetValue(item.DialedNumber, out var _))
-                                                    {
-                                                        <button onclick="RemoveFromCart('PhoneNumber', @item.DialedNumber, 1, this)" class="btn btn-outline-danger">
-                                                            <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
-                                                            Remove
-                                                        </button>
+                                                </td>
+                                            </tr>
+                                        }
+                                        else
+                                        {
+                                            <tr id="@item?.DialedNumber">
+                                                <td class="d-none d-sm-table-cell">
+                                                    @{
+                                                        if (item?.NumberType == "Standard")
+                                                        {
+                                                            <h4><span class="badge badge-secondary">Standard</span></h4>
+                                                        }
+                                                        else if (item?.NumberType == "Premium")
+                                                        {
+                                                            <h4><span class="badge badge-primary">Premium</span></h4>
+                                                        }
+                                                        else if (item?.NumberType == "Executive")
+                                                        {
+                                                            <h4><span class="badge badge-success">Executive</span></h4>
+                                                        }
+                                                        else if (item?.NumberType == "Tollfree")
+                                                        {
+                                                            <h4><span class="badge badge-dark">Tollfree</span></h4>
+                                                        }
                                                     }
-                                                    else
-                                                    {
-                                                        <button onclick="AddToCart('PhoneNumber', @item?.DialedNumber, 1, this)" class="btn btn-outline-primary">
-                                                            <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
-                                                            Add to Cart
-                                                        </button>
+                                                </td>
+                                                <td scope="row"><h4>@formattedNumber</h4></td>
+                                                <td class="d-none d-sm-table-cell">@Html.Raw(number)</td>
+                                                <td class="d-none d-sm-table-cell">@location</td>
+                                                <td>
+                                                    @{
+                                                        if (item is not null && item.Purchased)
+                                                        {
+                                                            <button class="btn btn-outline-secondary disabled">
+                                                                Already Purchased
+                                                            </button>
+                                                        }
+                                                        else if (alreadyInCart is not null && item?.DialedNumber is not null && alreadyInCart.TryGetValue(item.DialedNumber, out var _))
+                                                        {
+                                                            <button onclick="RemoveFromCart('PhoneNumber', @item.DialedNumber, 1, this)" class="btn btn-outline-danger">
+                                                                <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
+                                                                Remove
+                                                            </button>
+                                                        }
+                                                        else
+                                                        {
+                                                            <button onclick="AddToCart('PhoneNumber', @item?.DialedNumber, 1, this)" class="btn btn-outline-primary">
+                                                                <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span>
+                                                                Add to Cart
+                                                            </button>
+                                                        }
                                                     }
-                                                }
-                                            </td>
-                                        </tr>
+                                                </td>
+                                            </tr>
+                                        }
                                     }
                                 }
-                            }
-                        </tbody>
-                    </table>
-                </div>
-                <form action="/Search" class="col-12 pr-0 pl-0 pt-4 pb-3">
-                    <div class="btn-group float-right" role="group" aria-label="pagination">
-                        @{
-                            if (Model?.Page > 1)
-                            {
-                                var previousPage = Model.Page - 1;
-                                if (string.IsNullOrWhiteSpace(Model?.City))
+                            </tbody>
+                        </table>
+                    </div>
+                    <form action="/Search">
+                        <div class="btn-group float-right pb-1 pb-md-3 pt-1 pt-md-3" role="group" aria-label="pagination">
+                            @{
+                                if (Model?.Page > 1)
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@previousPage">Previous</a>
+                                    var previousPage = Model.Page - 1;
+                                    if (string.IsNullOrWhiteSpace(Model?.City))
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@previousPage">Previous</a>
+                                    }
+                                    else
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model?.City&View=@Model?.View&Page=@previousPage">Previous</a>
+                                    }
+                                    <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
                                 }
                                 else
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model?.City&View=@Model?.View&Page=@previousPage">Previous</a>
+                                    <a class="btn btn-outline-secondary disabled">Previous</a>
+                                    <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
                                 }
-                                <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
-                            }
-                            else
-                            {
-                                <a class="btn btn-outline-secondary disabled">Previous</a>
-                                <a class="btn btn-outline-dark disabled">Page @Model?.Page of @maxPage</a>
-                            }
-                            if (Model?.NumberOfResults > pageResultsCount)
-                            {
-                                var nextPage = Model.Page + 1;
-                                if (string.IsNullOrWhiteSpace(Model?.City))
+                                if (Model?.NumberOfResults > pageResultsCount)
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@nextPage">Next</a>
+                                    var nextPage = Model.Page + 1;
+                                    if (string.IsNullOrWhiteSpace(Model?.City))
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model?.Query&View=@Model?.View&Page=@nextPage">Next</a>
+                                    }
+                                    else
+                                    {
+                                        <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=@Model.View&Page=@nextPage">Next</a>
+                                    }
                                 }
                                 else
                                 {
-                                    <a class="btn btn-outline-secondary" onclick="displayBusyIndicator(this)" href="/Search?Query=@Model.Query&City=@Model.City&View=@Model.View&Page=@nextPage">Next</a>
+                                    <a class="btn btn-outline-secondary disabled">Next</a>
                                 }
                             }
-                            else
-                            {
-                                <a class="btn btn-outline-secondary disabled">Next</a>
-                            }
-                        }
-                    </div>
-                </form>
-
-                <br />
+                        </div>
+                    </form>
+                    <br />
+                </div>
             </div>
         </div>
     }
     else if (Model != null && Model?.PhoneNumbers?.Count() == 0)
     {
-        <div class="container">
-            <div class="row pt-3 pb-3">
-                <div class="alert alert-danger col-12" role="alert">
-                    No available numbers found!
+        <div class="pt-3 pb-3">
+            <div class="container">
+                <div class="row">
+                    <div class="alert alert-danger col-12" role="alert">
+                        No available numbers found!
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/NumberSearch.Mvc/Views/Shared/_Layout.cshtml b/NumberSearch.Mvc/Views/Shared/_Layout.cshtml
index 165095a4..17f814ed 100644
--- a/NumberSearch.Mvc/Views/Shared/_Layout.cshtml
+++ b/NumberSearch.Mvc/Views/Shared/_Layout.cshtml
@@ -129,10 +129,10 @@
     <main role="main">
         @RenderBody()
     </main>
-    <footer class="footer bg-dark pt-5 pb-3">
+    <footer class="footer bg-dark pt-4 pb-4">
         <div class="container">
             <div class="row">
-                <div class="col-md-4 pb-3 mb-4">
+                <div class="col-md-4">
                     <div class="row">
                         <div class="col-6">
                             <a class="d-block mb-3" href="/" width="100%"><img src="/images/scaled/accelerate.webp" alt="Accelerate Networks" width="100%" loading="lazy"></a>
@@ -186,7 +186,7 @@
                 </div>
             </div>
             <hr class="my-0 border-light">
-            <div class="row align-items-center mt-3 py-4">
+            <div class="row align-items-center py-4">
                 <div class="col-md-6">
                     <p class="mb-0"><span class="text-light">© Accelerate Networks. Proudly made in Seattle.</span></p>
                 </div>