diff --git a/components/market/dialog.php b/components/market/dialog.php
index 2b8032f..5738a6c 100644
--- a/components/market/dialog.php
+++ b/components/market/dialog.php
@@ -39,7 +39,7 @@
                     <th valign="middle" width="30%" style="white-space:nowrap;"><input style="margin:0;display:inline" onkeyup="codiad.market.search(event, this.value,'<?php echo $_GET['note']; ?>')" value="<?php if(isset($_GET['query'])) echo $_GET['query'];?>" placeholder="<?php i18n("Press Enter to Search"); ?>"></th>
                 </tr>
              </table>
-             <div class="wrapper">
+             <div class="market-wrapper">
              <table width="100%">
             <?php
                 $marketplace = array();
diff --git a/components/project/dialog.php b/components/project/dialog.php
index 1fd0170..313a99c 100755
--- a/components/project/dialog.php
+++ b/components/project/dialog.php
@@ -79,11 +79,14 @@
             <div id="project-list">
             <table width="100%">
                 <tr>
-                    <th width="5"><?php i18n("Open"); ?></th>
-                    <th><?php i18n("Project Name"); ?></th>
-                    <th><?php i18n("Path"); ?></th>
-                    <?php if(checkAccess()){ ?><th width="5"><?php i18n("Delete"); ?></th><?php } ?>
+                    <th width="70"><?php i18n("Open"); ?></th>
+                    <th width="150"><?php i18n("Project Name"); ?></th>
+                    <th width="250"><?php i18n("Path"); ?></th>
+                    <?php if(checkAccess()){ ?><th width="70"><?php i18n("Delete"); ?></th><?php } ?>
                 </tr>
+            </table>
+            <div class="project-wrapper">
+            <table width="100%" style="word-wrap: break-word;word-break: break-all;">    
             <?php
             
             // Get projects JSON data
@@ -95,18 +98,18 @@
                 if($show){
                 ?>
                 <tr>
-                    <td><a onclick="codiad.project.open('<?php echo($data['path']); ?>');" class="icon-folder bigger-icon"></a></td>
-                    <td><?php echo($data['name']); ?></td>
-                    <td><?php echo($data['path']); ?></td>
+                    <td width="70"><a onclick="codiad.project.open('<?php echo($data['path']); ?>');" class="icon-folder bigger-icon"></a></td>
+                    <td width="150"><?php echo($data['name']); ?></td>
+                    <td width="250"><?php echo($data['path']); ?></td>
                     <?php
                         if(checkAccess()){
                             if($_SESSION['project'] == $data['path']){
                             ?>
-                            <td><a onclick="codiad.message.error('Active Project Cannot Be Removed');" class="icon-block bigger-icon"></a></td>
+                            <td width="70"><a onclick="codiad.message.error('Active Project Cannot Be Removed');" class="icon-block bigger-icon"></a></td>
                             <?php
                             }else{
                             ?>
-                            <td><a onclick="codiad.project.delete('<?php echo($data['name']); ?>','<?php echo($data['path']); ?>');" class="icon-cancel-circled bigger-icon"></a></td>
+                            <td width="70"><a onclick="codiad.project.delete('<?php echo($data['name']); ?>','<?php echo($data['path']); ?>');" class="icon-cancel-circled bigger-icon"></a></td>
                             <?php
                             }
                         }
@@ -118,6 +121,7 @@
             ?>
             </table>
             </div>
+            </div>
             <?php if(checkAccess()){ ?><button class="btn-left" onclick="codiad.project.create();"><?php i18n("New Project"); ?></button><?php } ?>
     		<button class="<?php if(checkAccess()){ echo('btn-right'); } ?>" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
diff --git a/components/user/dialog.php b/components/user/dialog.php
index 11ed650..e50e271 100755
--- a/components/user/dialog.php
+++ b/components/user/dialog.php
@@ -33,11 +33,14 @@
             <div id="user-list">
             <table width="100%">
                 <tr>
-                    <th><?php i18n("Login"); ?></th>
-                    <th width="5"><?php i18n("Password"); ?></th>
-                    <th width="5"><?php i18n("Projects"); ?></th>
-                    <th width="5"><?php i18n("Delete"); ?></th>
+                    <th width="150"><?php i18n("Login"); ?></th>
+                    <th width="85"><?php i18n("Password"); ?></th>
+                    <th width="75"><?php i18n("Projects"); ?></th>
+                    <th width="70"><?php i18n("Delete"); ?></th>
                 </tr>
+            </table>
+            <div class="user-wrapper">
+            <table width="100%" style="word-wrap: break-word;word-break: break-all;">    
             <?php
 
             // Get projects JSON data
@@ -45,17 +48,17 @@
             foreach($users as $user=>$data){
             ?>
             <tr>
-                <td><?php echo($data['username']); ?></td>
-                <td><a onclick="codiad.user.password('<?php echo($data['username']); ?>');" class="icon-flashlight bigger-icon"></a></td>
-                <td><a onclick="codiad.user.projects('<?php echo($data['username']); ?>');" class="icon-archive bigger-icon"></a></td>
+                <td width="150"><?php echo($data['username']); ?></td>
+                <td width="85"><a onclick="codiad.user.password('<?php echo($data['username']); ?>');" class="icon-flashlight bigger-icon"></a></td>
+                <td width="75"><a onclick="codiad.user.projects('<?php echo($data['username']); ?>');" class="icon-archive bigger-icon"></a></td>
                 <?php
                     if($_SESSION['user'] == $data['username']){
                     ?>
-                    <td><a onclick="codiad.message.error('You Cannot Delete Your Own Account');" class="icon-block bigger-icon"></a></td>
+                    <td width="75"><a onclick="codiad.message.error('You Cannot Delete Your Own Account');" class="icon-block bigger-icon"></a></td>
                     <?php
                     }else{
                     ?>
-                    <td><a onclick="codiad.user.delete('<?php echo($data['username']); ?>');" class="icon-cancel-circled bigger-icon"></a></td>
+                    <td width="70"><a onclick="codiad.user.delete('<?php echo($data['username']); ?>');" class="icon-cancel-circled bigger-icon"></a></td>
                     <?php
                     }
                     ?>
@@ -65,6 +68,7 @@
             ?>
             </table>
             </div>
+            </div>
             <button class="btn-left" onclick="codiad.user.createNew();"><?php i18n("New Account"); ?></button>
     		<button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
diff --git a/themes/default/market/screen.css b/themes/default/market/screen.css
index 50c1eab..e873c13 100644
--- a/themes/default/market/screen.css
+++ b/themes/default/market/screen.css
@@ -1,4 +1,4 @@
-.wrapper {
+.market-wrapper {
   height: 450px; 
   width: 100%; 
   overflow-y: auto; 
diff --git a/themes/default/project/screen.css b/themes/default/project/screen.css
index 8e338a3..cfff5f0 100644
--- a/themes/default/project/screen.css
+++ b/themes/default/project/screen.css
@@ -4,6 +4,13 @@
     margin: 15px 0;
 }
 
+.project-wrapper {
+  max-height: 450px; 
+  width: 100%; 
+  overflow-y: auto; 
+  overflow-x: hidden;
+}
+
 .project-list-title {
     position: absolute;
     z-index: 9998;
diff --git a/themes/default/user/screen.css b/themes/default/user/screen.css
index 0ccbc02..134dabc 100644
--- a/themes/default/user/screen.css
+++ b/themes/default/user/screen.css
@@ -6,5 +6,12 @@
     max-height: 250px;
 }
 
+.user-wrapper {
+  max-height: 450px; 
+  width: 100%; 
+  overflow-y: auto; 
+  overflow-x: hidden;
+}
+
 #project-selector table td { border: none; border-bottom: 1px solid #666; }
 #project-selector table tr:last-child td { border: none; }
\ No newline at end of file