diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index a831488..b8640f6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -271,31 +271,30 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
    } 
     
     function ShowAssignedModulesPopup(userModules) {
+        $('#dvUserModulesInfo').modal('hide');
+        $('#dvPending').modal('hide');
         var allModules = Modules;
         var arrPendingModules = [];
-        if ($('#dvPendingModules').length > 0) {
-            $('#dvPending').hide();
-        }
-        for (var module = 1; module <= allModules.length; module++) {
-            $('#moduleDiv' + module).hide();
-        }
-        if (('#moduleDiv1017').length > 0) {
-            $('#moduleDiv1017').hide();
-        }
 
         for (var count = 0; count < userModules.length; count++) {
             for (var module = 0; module < allModules.length; module++) {
                 if (userModules[count].id == allModules[module].Id) {
-                    $('#moduleDiv' + userModules[count].id).show();
+                    $('#dvUserModules').append('<div class="form-group"><div class="col-sm-8">• ' + userModules[count].name + '</div></div>');
                     break;
                 }
 
-                if (userModules[count].id == 7)
-                    arrPendingModules.push(userModules[count].id);
-                if (userModules[count].id == 8)
-                    arrPendingModules.push(userModules[count].id);
-                if (userModules[count].id == 10)
-                    arrPendingModules.push(userModules[count].id);
+                if (userModules[count].id == 7) {
+                    arrPendingModules.push(userModules[count]);
+                    break;
+                }
+                if (userModules[count].id == 8) {
+                    arrPendingModules.push(userModules[count]);
+                    break;
+                }
+                if (userModules[count].id == 10) {
+                    arrPendingModules.push(userModules[count]);
+                    break;
+                }
             }
         }
         if (userModules.length > 0) {
@@ -303,6 +302,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         }
 
         if (arrPendingModules.length > 0) {
+            $('#dvPending').modal('show');
+            for (var module = 0; module < arrPendingModules.length; module++) {
+                $('#dvPendingModules').append('<div class="form-group"><div class="col-sm-8"><i>• ' + arrPendingModules[module].name + '</i></div></div>');
+            }
             $('#dvPendingModules').show();
         }
     }
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index c23caff..93d3f16 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1244,64 +1244,11 @@
                     <div class="panel-body">
                         <!-- form -->
                         <form class="form-horizontal">
-                            <div>
-                                <div class="form-group" id="moduleDiv1">
-                                    <div class="col-sm-8">• Dissectible Anatomy</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv2">
-                                    <div class="col-sm-8">• Atlas Anatomy</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv3">
-                                    <div class="col-sm-8">• 3D Anatomy</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv4">
-                                    <div class="col-sm-8">• Clinical Illustrations</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv5">
-                                    <div class="col-sm-8">• Clinical Animations</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv6">
-                                    <div class="col-sm-8">• Encyclopedia</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv9">
-                                    <div class="col-sm-8">• IP 10</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv11">
-                                    <div class="col-sm-8">• In - Depth Reports</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv12">
-                                    <div class="col-sm-8">• Complementary and Alternative Medicine</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv13">
-                                    <div class="col-sm-8">• A.D.A.M Images</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv14">
-                                    <div class="col-sm-8">• Body Guide</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv15">
-                                    <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->
-                                </div>
-                                <div class="form-group" id="moduleDiv16">
-                                    <div class="col-sm-8">• The Wellness Tools</div>
-                                </div>
-                                <div class="form-group" id="moduleDiv1017">
-                                    <div class="col-sm-8">• A.D.A.M on Demand</div>
-                                </div>
-                            </div>
+                            <div id="dvUserModules" ></div>                           
                             <!--<hr style="border: 1px solid;"/>-->
                             <div id="dvPending" style="margin: 15px 0;"><b>Pending Modules</b></div>
                             <!--<hr style="border: 1px solid;" />-->
-                            <div>
-                                <div class="form-group" id="moduleDiv7">
-                                    <div class="col-sm-12"><i>• Curriculum Builder</i></div> <!--(To be available by 09/25/2017)-->
-                                </div>
-                                <div class="form-group" id="moduleDiv8">
-                                    <div class="col-sm-8"><i>• Anatomy Test</i></div> <!--(To be available by 08/28/2017)-->
-                                </div>
-                                <div class="form-group" id="moduleDiv10">
-                                    <div class="col-sm-8"><i>• Lab Exercises</i></div> <!--(To be available by 08/16/2017)-->
-                                </div>
-                            </div>
+                            <div id="dvPendingModules"></div>
                             <div class="form-group">
                                 <div style="text-align: center">
                                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" data-dismiss="modal"><i class="fa fa-check"></i> OK</button>