diff --git a/rodan-client/code/src/js/Controllers/ControllerContextMenu.js b/rodan-client/code/src/js/Controllers/ControllerContextMenu.js
index 989364838..672cca735 100644
--- a/rodan-client/code/src/js/Controllers/ControllerContextMenu.js
+++ b/rodan-client/code/src/js/Controllers/ControllerContextMenu.js
@@ -51,10 +51,10 @@ export default class ControllerContextMenu extends BaseController
                 Radio.channel(channel).request(data.request, data.options);
             };
 
-            var anchor = $('<a>' + label + '</a>');
+            var anchor = $('<a class="dropdown-btn">' + label + '</a>');
             anchor.data('radio', {request: radiorequest, options: callOptions});
             anchor.click(functionCall);
-            $('#menu-context').append($('<li></li>').append(anchor));
+            $('#menu-context').append(anchor);
         }
         $('#menu-context').css('top', options.top);
         $('#menu-context').css('left', options.left);
diff --git a/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewControlWorkflowJob.js b/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewControlWorkflowJob.js
index b877a77d2..db99e7060 100644
--- a/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewControlWorkflowJob.js
+++ b/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewControlWorkflowJob.js
@@ -20,6 +20,7 @@ export default class ViewControlWorkflowJob extends Marionette.View
     initialize(options)
     {
         this._workflow = options.workflow;
+        this.setElement('<div class="content-wrapper column-content"></div>');
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewSettings.js b/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewSettings.js
index 7916b07e1..82d3e84dc 100644
--- a/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewSettings.js
+++ b/rodan-client/code/src/js/Views/Master/Main/WorkflowJob/ViewSettings.js
@@ -21,6 +21,7 @@ export default class ViewSettings extends Marionette.View
     initialize(options)
     {
         this._workflow = options.workflow;
+        this.setElement('<div class="content-wrapper column-content"></div>');
     }
 
     /**
@@ -63,16 +64,19 @@ export default class ViewSettings extends Marionette.View
         var jobUuid = this.model.getJobUuid();
         var collection = Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__GLOBAL_JOB_COLLECTION);
         var job = collection.get(jobUuid);
+        console.log(job);
+        console.log(job.get('settings'));
         var settingsSchema = {
             schema: job.get('settings'),
-            theme: 'bootstrap3',
+            theme: 'barebones',
             disable_collapse: true,
             disable_edit_json: true,
             disable_properties: true,
             no_additional_properties: true,
             show_errors: 'always',
             startval: startValues,
-            form_name_root: ' '
+            form_name_root: ' ',
+            onClassName: () => { return 'content-wrapper row-content'; },
         };
         this._editor = new JSONEditor(element, settingsSchema);
     }
@@ -90,8 +94,8 @@ ViewSettings.prototype.modelEvents = {
 };
 ViewSettings.prototype.ui = {
     buttonSave: '#button-save_workflowjob_settings'
-        };
+};
 ViewSettings.prototype.events = {
     'click @ui.buttonSave': '_handleButtonSave'
-        };
+};
 ViewSettings.prototype.template = _.template($('#template-main_workflowjob_settings').text());
diff --git a/rodan-client/code/styles/default.css b/rodan-client/code/styles/default.css
index bf89eb831..857bc9c12 100644
--- a/rodan-client/code/styles/default.css
+++ b/rodan-client/code/styles/default.css
@@ -121,6 +121,7 @@ textarea {
     border-radius: 3px;
     outline: none;
 }
+ 
 /* Table styles */
 table {
     user-select: none;
@@ -173,6 +174,7 @@ tbody > tr:hover {
 .content-wrapper.row-content {
     flex-direction: row;
 }
+/* flex horizontal alignment */
 .column-left {
     align-items: flex-start;
 }
@@ -191,6 +193,29 @@ tbody > tr:hover {
 .row-right {
     justify-content: flex-end;
 }
+/* flex vertical alignment */
+.column-top {
+    justify-content: flex-start;
+}
+.row-top {
+    align-items: flex-start;
+}
+.column-middle {
+    justify-content: center;
+}
+.row-middle {
+    align-items: center;
+}
+.column-bottom {
+    justify-content: flex-end;
+}
+.row-bottom {
+    align-items: flex-end;
+}
+/* flex gap */
+.flex-gap-5 {
+    gap: 5px;
+}
 .flex-gap-10 {
     gap: 10px;
 }
@@ -200,17 +225,35 @@ tbody > tr:hover {
 .flex-gap-30 {
     gap: 30px;
 }
+/* padding */
 .padding-5 {
     padding: 5px;
-    box-sizing: border-box;
 }
 .padding-10 {
     padding: 10px;
-    box-sizing: border-box;
 }
 .padding-20 {
     padding: 20px;
-    box-sizing: border-box;
+}
+.padding-30 {
+    padding: 30px;
+}
+/* positioning */
+.pos-absolute {
+    position: absolute;
+}
+.pos-relative {
+    position: relative;
+}
+.pos-fixed {
+    position: fixed;
+}
+.pos-static {
+    position: static;
+}
+/* text */
+.text-nowrap {
+    text-wrap: nowrap;
 }
 /* buttons */
 .btn {
@@ -291,6 +334,10 @@ tbody > tr:hover {
     box-shadow: 0px 5px 5px 1px #00000057;
     border-radius: 0px 0px 3px 3px;
 }
+.dropdown-menu.context-menu {
+    box-shadow: 0px 0px 5px 1px #00000057;
+    border-radius: 3px;
+}
 .dropdown-btn {
     display: flex;
     width: 100%;
@@ -405,7 +452,7 @@ tbody > tr:hover {
 .node-text {
     font-size: 15px;
     width: 100%;
-    padding: 3px 0px;
+    padding: 3px;
 }
 .node-text:hover {
     background-color: var(--primary-app-color);
@@ -469,7 +516,7 @@ tbody > tr:hover {
     gap: 15px;
 }
 .region-main-section {
-    width: 98%;
+    width: 100%;
 }
 /* Main region header */
 .region-main-section.region-main-header {
@@ -611,14 +658,13 @@ tbody > tr:hover {
     border-radius: 5px;
     background-color: #f0f0f047;
     height: fit-content;
-    width: 98%;
+    width: 100%;
     overflow-x: auto;
-    max-height: 85%;
+    max-height: 1000px;
 }
 .project-collections {
     gap: 25px;
     padding-top: 20px;
-    padding-bottom: 10px;
     box-sizing: border-box;
     width: 85%;
     border-right: 2px solid #dfdfdf;
@@ -866,8 +912,8 @@ div#main_workflowbuilder
 /* general modal styles */
 #modal-generic {
     position: absolute;
-    width: fit-content;
-    height: fit-content;
+    width: initial;
+    height: initial;
     max-width: 1200px;
     min-width: 500px;
     background-color: #ffffff90;
@@ -875,13 +921,21 @@ div#main_workflowbuilder
     z-index: 9999;
     border-radius: 5px;
     backdrop-filter: blur(20px);
+    -webkit-backdrop-filter: blur(20px);
     overflow: hidden;
     display: none;
     animation: fade-in 0.2s ease-in-out forwards;
 }
-.modal-content
-{
-
+.modal-dialog {
+    width: fit-content;
+    height: fit-content;
+    border-radius: 3px;
+    position: relative;
+    overflow: hidden;
+    background-color: white;
+    backdrop-filter: blur(20px);
+    min-width: 500px;
+    /* min-height: 300px; */
 }
 .modal-header {
     align-items: center;
@@ -891,6 +945,7 @@ div#main_workflowbuilder
     background-color: #488bcb;
     color: white;
     font-size: 15px;
+    height: 40px;
 }
 .modal-close {
     cursor: pointer;
@@ -901,10 +956,14 @@ div#main_workflowbuilder
     overflow-y: auto;
     padding: 20px;
     box-sizing: border-box;
+    font-size: 12px;
 }
 .modal-body-section {
     align-items: flex-start;
 }
+.modal-subtitle-container {
+    height: 30px;
+}
 .modal-subtitle {
     font-size: 13px;
     font-weight: bold;
@@ -912,6 +971,8 @@ div#main_workflowbuilder
 .modal-footer
 {
     padding: 10px;
+    max-height: 40px;
+    height: fit-content;
 }
 .modal-footer-error, .modal-input-error
 {
@@ -936,6 +997,33 @@ div#main_workflowbuilder
     flex-grow: 0; /* overwrite general input element styles (which have flex-grow value of 1) */
 }
 
+/* resource assignment modal */
+#resource-assignment-actions-container {
+    height: fit-content;
+    padding: 5px;
+    border: 1px solid #cecece;
+    border-radius: 3px;
+    background-color: #f9f9f9;
+    max-width: 150px;
+}
+
+/* job settings modal */
+#workflowjob-settings:first-child {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+}
+
+#workflowjob-settings {
+
+}
+
+.this-is-my-class {
+    background-color: green;
+}
+
+
 
 /* ------------ */
 /* Table styles */
diff --git a/rodan-client/code/templates/Views/Master/Main/Login/template-main_login.html b/rodan-client/code/templates/Views/Master/Main/Login/template-main_login.html
index 32b219078..a23fe9a21 100644
--- a/rodan-client/code/templates/Views/Master/Main/Login/template-main_login.html
+++ b/rodan-client/code/templates/Views/Master/Main/Login/template-main_login.html
@@ -2,7 +2,7 @@
     <div class="col-xs-12">
         <div class="vertical-center">
             <div class="horizontal-center">
-        		<form class="content-wrapper row-content" role="form" action="javascript:void(0);">
+        		<form class="content-wrapper row-content flex-gap-10" role="form" action="javascript:void(0);">
                     <div class="form-group">
                         <label for="text-login_email">Email address:</label>
                         <input type="text" class="form-control" id="text-login_email">
diff --git a/rodan-client/code/templates/Views/Master/Main/Project/Collection/template-main_project_collection.html b/rodan-client/code/templates/Views/Master/Main/Project/Collection/template-main_project_collection.html
index d311b915e..12a32e405 100644
--- a/rodan-client/code/templates/Views/Master/Main/Project/Collection/template-main_project_collection.html
+++ b/rodan-client/code/templates/Views/Master/Main/Project/Collection/template-main_project_collection.html
@@ -5,20 +5,22 @@
     </div>
 </div>
 
-<div class="content-wrapper column-content region-main-section table-responsive">
-    <table class="table table-hover table-condensed" id="table-projects">
-        <thead>
-            <tr>
-                <th data-name="name">Name</th>
-                <th data-name="creator">Creator</th>
-                <th data-name="created">Created</th>
-                <th data-name="updated">Updated</th>
-                <th>Resources</th>
-                <th>Resource Lists</th>
-                <th>Workflows</th>
-            </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
+<div class="content-wrapper column-content padding-10 flex-gap-10">
+    <div class="content-wrapper column-content region-main-section table-responsive">
+        <table class="table table-hover table-condensed" id="table-projects">
+            <thead>
+                <tr>
+                    <th data-name="name">Name</th>
+                    <th data-name="creator">Creator</th>
+                    <th data-name="created">Created</th>
+                    <th data-name="updated">Updated</th>
+                    <th>Resources</th>
+                    <th>Resource Lists</th>
+                    <th>Workflows</th>
+                </tr>
+            </thead>
+            <tbody>
+            </tbody>
+        </table>
+    </div>
 </div>
\ No newline at end of file
diff --git a/rodan-client/code/templates/Views/Master/Main/Project/Individual/template-main_project_individual.html b/rodan-client/code/templates/Views/Master/Main/Project/Individual/template-main_project_individual.html
index ba408d39f..cc6ef5e97 100644
--- a/rodan-client/code/templates/Views/Master/Main/Project/Individual/template-main_project_individual.html
+++ b/rodan-client/code/templates/Views/Master/Main/Project/Individual/template-main_project_individual.html
@@ -7,7 +7,7 @@
 
     <div class="content-wrapper row-content region-main-content">
         <!-- Project collections (workflow runs, resources, etc.) -->
-        <div class="content-wrapper column-content project-collections" role="group">
+        <div class="content-wrapper column-content project-collections padding-10">
             <div class="content-wrapper row-content project-navigation-bar">
                 <button class="btn project-nav-bar-btn active" id="button-workflow_runs">Workflow Runs</button>
                 <button class="btn project-nav-bar-btn" id="button-runjobs">Run Jobs</button>
diff --git a/rodan-client/code/templates/Views/Master/Main/ResourceAssignment/template-main_resourceassignment.html b/rodan-client/code/templates/Views/Master/Main/ResourceAssignment/template-main_resourceassignment.html
index 384370323..bdb2a3390 100644
--- a/rodan-client/code/templates/Views/Master/Main/ResourceAssignment/template-main_resourceassignment.html
+++ b/rodan-client/code/templates/Views/Master/Main/ResourceAssignment/template-main_resourceassignment.html
@@ -1,20 +1,26 @@
-<div class="content-wrapper row-content flex-gap-10" style="display: flex; align-items: flex-start;">
-    <div class="content-wrapper column-content">
-        <h3>Available Resources</h3>
-        <div id="region-main_resourceassignment_availableresources"></div>
+<div class="content-wrapper row-content row-left row-top row-middle flex-gap-10">
+    <div class="content-wrapper column-content flex-gap-10">
+        <div class="content-wrapper row-content row-left modal-subtitle-container">
+            <h3 class="text-nowrap">Available Resources</h3>
+        </div>
+        <div id="region-main_resourceassignment_availableresources" class="content-wrapper column-content"></div>
     </div>
-    <div class="content-wrapper column-content flex-gap-10" style="padding-top: 200px">
+    <div id="resource-assignment-actions-container" class="content-wrapper column-content column-middle flex-gap-10">
 	    <div class="content-wrapper column-content flex-gap-10" role="group" aria-label="...">
-			<button type="button" class="btn btn-success btn-xs" id="button-add_selected">Add selected</button>
-     		<button type="button" class="btn btn-success btn-xs" id="button-add_all">Add all</button>
+			<button type="button" class="btn" id="button-add_selected">Add selected</button>
+     		<button type="button" class="btn" id="button-add_all">Add all</button>
 		    <hr>
-			<button type="button" class="btn btn-success btn-xs" id="button-remove_selected">Remove selected</button>
-			<button type="button" class="btn btn-success btn-xs" id="button-remove_all">Remove all</button>
+			<button type="button" class="btn btn-remove" id="button-remove_selected">Remove selected</button>
+			<button type="button" class="btn btn-remove" id="button-remove_all">Remove all</button>
 		</div>
     </div>
-    <div class="content-wrapper column-content">
-        <h3>Assigned Resources</h3>
-        <p><span id="region-main_resourceassignment_assignedresources_num"></span> Resource(s) Assigned</p>
-        <div id="region-main_resourceassignment_assignedresources"></div>
+    <div class="content-wrapper column-content flex-gap-10">
+        <div class="content-wrapper row-content flex-gap-10 modal-subtitle-container">
+            <h3 class="text-nowrap">Assigned Resources -</h3>
+            <div class="content-wrapper row-content">
+                <p class="text-nowrap"><span id="region-main_resourceassignment_assignedresources_num"></span> Resource(s) Assigned</p>            
+            </div>
+        </div>
+        <div id="region-main_resourceassignment_assignedresources" class="content-wrapper column-content"></div>
     </div>
 </div>
diff --git a/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob.html b/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob.html
index a569b04f5..484c6e622 100644
--- a/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob.html
+++ b/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob.html
@@ -1,7 +1,16 @@
-<label for="text-workflowjob_name">Name:</label>
-<input type="text" class="form-control input-sm" id="text-workflowjob_name" value="<%= _.escape(name) %>" name="text-workflowjob_name">
-<br/>
-<label for="text-job_name">Job:</label><span name="text-job_name"><%= job_name %></span>
+<div class="content-wrapper row-content row-left flex-gap-10">
+    <label class="details-item-label" for="text-workflowjob_name">Name:</label>
+    <input type="text" class="details-item-value" id="text-workflowjob_name" value="<%= _.escape(name) %>" name="text-workflowjob_name">
+</div>
+
+<div class="content-wrapper row-content row-left flex-gap-10">
+    <label class="details-item-label" for="text-job_name">Job:</label>
+    <span class="details-item-value" name="text-job_name"><%= job_name %></span>
+</div>
+
 <hr>
-<button class="btn btn-xs btn-warning" id="button-save_workflowjob_data">Save</button>
-<button class="btn btn-xs btn-danger" id="button-delete_workflowjob">Delete</button>
\ No newline at end of file
+
+<div class="content-wrapper row-content row-left flex-gap-10">
+    <button class="btn" id="button-save_workflowjob_data">Save</button>
+    <button class="btn btn-remove" id="button-delete_workflowjob">Delete</button>
+</div>
\ No newline at end of file
diff --git a/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob_settings.html b/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob_settings.html
index f542023f4..fa4af1c87 100644
--- a/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob_settings.html
+++ b/rodan-client/code/templates/Views/Master/Main/WorkflowJob/template-main_workflowjob_settings.html
@@ -1,2 +1,2 @@
-<div id="workflowjob-settings"></div>
-<button class="btn btn-xs btn-warning" id="button-save_workflowjob_settings">Save</button>
\ No newline at end of file
+<div id="workflowjob-settings" class="content-wrapper column-content"></div>
+<button class="btn" id="button-save_workflowjob_settings">Save</button>
\ No newline at end of file
diff --git a/rodan-client/code/templates/Views/Master/Misc/template-misc_help.html b/rodan-client/code/templates/Views/Master/Misc/template-misc_help.html
index 0b824fab2..8aad76ffa 100644
--- a/rodan-client/code/templates/Views/Master/Misc/template-misc_help.html
+++ b/rodan-client/code/templates/Views/Master/Misc/template-misc_help.html
@@ -1,2 +1,4 @@
-Please visit <a href="<%= url %>"><%= url %></a><br>
-Client admin: <a href="mailto:<%= email %>"><%= name %></a>
\ No newline at end of file
+<div class="content-wrapper column-content flex-gap-10 column-middle">
+    Please visit <a href="<%= url %>"><%= url %></a>
+    Client admin: <a href="mailto:<%= email %>"><%= name %></a>
+</div>
\ No newline at end of file
diff --git a/rodan-client/code/templates/Views/Master/Modal/template-modal.html b/rodan-client/code/templates/Views/Master/Modal/template-modal.html
index faf9fb713..0f204862e 100644
--- a/rodan-client/code/templates/Views/Master/Modal/template-modal.html
+++ b/rodan-client/code/templates/Views/Master/Modal/template-modal.html
@@ -1,5 +1,5 @@
-<div class="content-wrapper column-content modal-dialog">
-    <div class="content-wrapper column-content modal-content">
+<div class="content-wrapper column-content column-middle">
+    <div class="content-wrapper column-content modal-dialog">
         <div class="content-wrapper row-content modal-header">
             <div class="modal-title"></div>
             <div id="modal-close" class="modal-close">&times;</div>
diff --git a/rodan-client/code/templates/Views/Master/Modal/template-modal_simple.html b/rodan-client/code/templates/Views/Master/Modal/template-modal_simple.html
index faf9fb713..0f204862e 100644
--- a/rodan-client/code/templates/Views/Master/Modal/template-modal_simple.html
+++ b/rodan-client/code/templates/Views/Master/Modal/template-modal_simple.html
@@ -1,5 +1,5 @@
-<div class="content-wrapper column-content modal-dialog">
-    <div class="content-wrapper column-content modal-content">
+<div class="content-wrapper column-content column-middle">
+    <div class="content-wrapper column-content modal-dialog">
         <div class="content-wrapper row-content modal-header">
             <div class="modal-title"></div>
             <div id="modal-close" class="modal-close">&times;</div>
diff --git a/rodan-client/code/templates/Views/Master/Tables/template-table_control.html b/rodan-client/code/templates/Views/Master/Tables/template-table_control.html
index 9642dc4c0..03e254303 100644
--- a/rodan-client/code/templates/Views/Master/Tables/template-table_control.html
+++ b/rodan-client/code/templates/Views/Master/Tables/template-table_control.html
@@ -23,4 +23,4 @@
 	<select id="pagination-select">
 		<span id="pagination-select-text">Page</span>
 	</select>
-</div>
+</div>
\ No newline at end of file
diff --git a/rodan-client/code/templates/Views/Master/template-master.html b/rodan-client/code/templates/Views/Master/template-master.html
index d2bd51284..ff80700ac 100644
--- a/rodan-client/code/templates/Views/Master/template-master.html
+++ b/rodan-client/code/templates/Views/Master/template-master.html
@@ -7,4 +7,4 @@
 <div id="modal-generic" class="modal content-wrapper column-content" role="dialog"></div>
 
 <!-- Generic dropdown -->
-<ul id="menu-context" class="dropdown-menu" role="menu" style="display: none"></ul>
\ No newline at end of file
+<ul id="menu-context" class="dropdown-menu context-menu" role="menu" style="display: none"></ul>
\ No newline at end of file