diff --git a/src/adonisjs/public/author/edit/inplace-editor.js b/src/adonisjs/public/author/edit/inplace-editor.js
index a5afb342..ef2fa810 100644
--- a/src/adonisjs/public/author/edit/inplace-editor.js
+++ b/src/adonisjs/public/author/edit/inplace-editor.js
@@ -223,12 +223,9 @@ class EditDCC {
     const ep = await this._extendedPanel(
       EditDCC.imageBrowseTemplate, mtype, ftypes)
     let path = null
-    console.log('=== selected')
-    console.log(ep.select.options[ep.select.selectedIndex].value)
     if (ep.select != null &&
         ep.select.options[ep.select.selectedIndex].value.length > 0)
       path = ep.select.options[ep.select.selectedIndex].value
-    /*
     else {
       console.log('===== files selected')
       for (let f of ep.browse.files)
@@ -243,7 +240,6 @@ class EditDCC {
         path = asset.message.filename
       }
     }
-    */
     this._removeExtendedPanel()
     return path
   }
diff --git a/src/adonisjs/public/author/env/inf331_2023/css/lab.css b/src/adonisjs/public/author/env/inf331_2023/css/lab.css
index 9933d41a..ad65fe0d 100644
--- a/src/adonisjs/public/author/env/inf331_2023/css/lab.css
+++ b/src/adonisjs/public/author/env/inf331_2023/css/lab.css
@@ -6,62 +6,86 @@
   --light: #FDE8E9;
 }
 .bg-lab-light {
-  background-color: var(--light) !important;
+  background-color: #FDE8E9 !important;
 }
 .bg-lab-light-pink {
-  background-color: var(--light-pink) !important;
+  background-color: #E3BAC6 !important;
 }
 .bg-lab-primary {
-  background-color: var(--primary) !important;
+  background-color: #BC9EC1 !important;
 }
 .bg-lab-secondary {
-  background-color: var(--secondary) !important;
+  background-color: #596475 !important;
 }
 .bg-lab-dark {
-  background-color: var(--dark) !important;
+  background-color: #1F2232 !important;
 }
 
 .text-lab-dark {
-  color: var(--dark) !important;
+  color: #1F2232 !important;
 }
 
 .text-lab-secondary {
-  color: var(--secondary) !important;
+  color: #596475 !important;
 }
 
 .text-lab-primary {
-  color: var(--primary) !important;
+  color: #BC9EC1 !important;
 }
 .text-primary {
-  color: var(--dark) !important;
+  color: #1F2232 !important;
 }
 
 .text-lab-light-pink {
-  color: var(--light-pink) !important;
+  color: #E3BAC6 !important;
 }
 
 .text-lab-light {
-  color: var(--light) !important;
+  color: #FDE8E9 !important;
 }
 
 .btn-lab-primary {
-	color: var(--light);
-	background-color: var(--dark);
-	border-color: var(--dark);
+	color: #FDE8E9 !important;
+	background-color: #1F2232 !important;
+	border-color: #1F2232 !important;
 }
 .btn-lab-primary:hover {
-  color: var(--primary) !important;
+  color: #BC9EC1 !important;
   font-size: 1.1rem !important;
 }
 
 .btn-lab-secondary {
-	color: var(--light);
-	background-color: var(--secondary);
-	border-color: var(--secondary);
+	color: #FDE8E9 !important;
+	background-color: #596475 !important;
+	border-color: #596475 !important;
+}
+.btn-lab-secondary:hover {
+	color: #BC9EC1 !important;
+}
+
+.btn-lab-save {
+	color: #1F2232 !important;
+	background-color: #E3BAC6 !important;
+	border-color: #1F2232 !important;
+  border-width: 0.2rem !important;
+}
+.btn-lab-save:hover {
+	background: #BC9EC1 !important;
 }
 
 .disabled-lock, .disabled-look{
-  pointer-events: none;
-  background-color: var(--light-pink);
-  opacity: 0.8
+  pointer-events: none !important;
+  background-color: #E3BAC6 !important;
+  opacity: 0.8 !important;
 }
+
+.border-lab-dark{
+  border-color: #1F2232 !important;
+}
+.border-lab-primary{
+  border-color: #BC9EC1 !important;
+}
+
+.no-pointers, .no-pointer{
+  pointer-events: none;
+}
\ No newline at end of file
diff --git a/src/adonisjs/public/author/env/inf331_2023/index.html b/src/adonisjs/public/author/env/inf331_2023/index.html
index 59f4f1d5..7d3342fd 100644
--- a/src/adonisjs/public/author/env/inf331_2023/index.html
+++ b/src/adonisjs/public/author/env/inf331_2023/index.html
@@ -52,10 +52,8 @@
   <script src="/infra/dcc-common-server-proxy.js"></script>
   <script src="/infra/dcc-common-server-address.js"></script>
   <script src="/infra/simple-page-tasks.js"></script>
-  <script src="/infra/token-validator.js"></script>
+  <script src="/infra/token-validator-swe.js"></script>
   <script src="/infra/conditional-layout.js"></script>
-  <script src="/prognosis/js/prognosis-bus.js"></script>
-  <script src="/prognosis/js/prognosis-bus-driver.js"></script>
 
   <script src="/dccs/components/visual/dcc-markdown.js"></script>
   <script src="/dccs/components/visual/dcc-annotation.js"></script>
@@ -88,7 +86,6 @@
   <script src="/dccs/base/property-dcc.js"></script>
   <script src="/dccs/base/connect-dcc.js"></script>
 
-
   <script src="/dccs/components/data/dcc-model.js"></script>
   <script src="/dccs/components/data/dcc-submit.js"></script>
   <script src="/dccs/components/data/dcc-record.js"></script>
@@ -98,7 +95,7 @@
   <script src="/dccs/components/web/dcc-rest.js"></script>
 
   <script src="/infra/dcc-rest-proxy.js"></script>
-  <script src="/infra/dcc-basic.js"></script>
+  <script src="/infra/dcc-basic-swe.js"></script>
 
   <script src="/lib/showdown/showdown.min.js"></script>
   <script src="/translator/translator.js"></script>
@@ -112,8 +109,51 @@
 </head>
 
 <body>
-
-  <dcc-include src="/author/partials/header.html"></dcc-include>
+  <div class="fixed-top up-scroll" style="transition: top 0.3s !important;">
+    <dcc-rest id="harena-login" bind="harena-login"></dcc-rest>
+    <nav>
+        <div class="d-flex overflow-hidden pt-2 mr-4" id="harena-header">
+  
+        <span class="inline-flex rounded-md ml-auto " id="header-login">
+          <div id="login-block">
+              <button id="loginDropdownBtn" class="btn btn-light border-top border-left border-right text-primary pl-4 pt-1 dropdown-toggle " type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                Login
+              </button>
+              <form class="needs-validation dropdown-menu p-4 mr-5" novalidate>
+                <div class="form-group">
+                  <label for="email">Email address</label>
+                  <input type="email" class="form-control" id="email" name="email" placeholder="email@example.com" required>
+                  <div class="invalid-feedback">
+                    Please type a valid email.
+                  </div>
+                </div>
+                <div class="form-group">
+                  <label for="password">Password</label>
+                  <input type="password" class="form-control" id="password" name="password" placeholder="Password" required>
+                </div>
+                <dcc-submit id="btn-submit-login" bind="submit-login" label="Login" xstyle="btn btn-outline-primary" connect="submit:harena-login:service/request/post"></dcc-submit>
+                <div id="login-message-alert" class="alert mt-3" role="alert">
+                </div>
+              </form>
+          </div>
+          <div id="logout-block" style="display: none;">
+            <dcc-rest id="harena-logout" bind="harena-logout"></dcc-rest>
+            <button id="logoutDropdownBtn" class="btn btn-light border-top border-left border-right text-lab-primary px-1 pt-1 dropdown-toggle " type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Logout
+            </button>
+            <div class="dropdown-menu mr-5" aria-labelledby="logoutDropdownBtn">
+              <a class="dropdown-item" href="/user/settings">Change Password</a>
+              <div class="dropdown-divider"></div>
+  
+              <dcc-submit xstyle="dropdown-item" id="logout-button" bind="submit-logout" label="Logout" connect="submit:harena-logout:service/request/post">
+  
+              </div>
+          </div>
+        </span>
+      </div>
+    </nav>
+  </div>
+  <!-- <dcc-include src="/author/partials/header.html"></dcc-include> -->
   <!-- Notice modal -->
   <div class="modal fade" id="notice-modal" tabindex="-1" role="dialog" aria-labelledby="notice-modal" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered" role="document">
diff --git a/src/adonisjs/public/author/env/inf331_2023/js/lab-progress.js b/src/adonisjs/public/author/env/inf331_2023/js/lab-progress.js
index 45b19b59..4a779891 100644
--- a/src/adonisjs/public/author/env/inf331_2023/js/lab-progress.js
+++ b/src/adonisjs/public/author/env/inf331_2023/js/lab-progress.js
@@ -7,12 +7,12 @@
     // this.labRelease = {1:new Date('2023/08/31'),2:new Date('2023/09/06'),
     // 3:new Date('2023/09/06'),4:new Date('2023/09/13'),
     // 5:new Date('2023/09/20'),6:new Date('2023/09/27')}
-    this.labRelease = {1:this.setDateToISO(hourExpiration(new Date('2023/08/31 GMT-0300'),18)),2:this.setDateToISO(hourExpiration(new Date('2023/09/06 GMT-0300'),15)),
-    3:this.setDateToISO(hourExpiration(new Date('2023/09/06 GMT-0300'),18)),4:this.setDateToISO(hourExpiration(new Date('2023/09/13 GMT-0300'),18)),
+    this.labRelease = {1:this.setDateToISO(hourExpiration(new Date('2023/09/05 GMT-0300'),13)),2:this.setDateToISO(hourExpiration(new Date('2023/09/05 GMT-0300'),14)),
+    3:this.setDateToISO(hourExpiration(new Date('2023/09/11 GMT-0300'),14)),4:this.setDateToISO(hourExpiration(new Date('2023/09/13 GMT-0300'),18)),
     5:this.setDateToISO(hourExpiration(new Date('2023/09/20 GMT-0300'),18)),6:this.setDateToISO(hourExpiration(new Date('2023/09/27 GMT-0300'),18))}
-    this.labExpiration = {1:this.setDateToISO(hourExpiration(new Date('2023/09/07 GMT-0300'),8)), 2:this.setDateToISO(hourExpiration(new Date('2023/09/16 GMT-0300'),8)),
-    3:this.setDateToISO(hourExpiration(new Date('2023/09/16 GMT-0300'),8)),4:this.setDateToISO(hourExpiration(new Date('2023/09/23 GMT-0300'),8)),
-    5:this.setDateToISO(hourExpiration(new Date('2023/09/30 GMT-0300'),8)),6:this.setDateToISO(hourExpiration(new Date('2023/10/06 GMT-0300'),8))}
+    this.labExpiration = {1:this.setDateToISO(hourExpiration(new Date('2023/09/09 GMT-0300'),23)), 2:this.setDateToISO(hourExpiration(new Date('2023/09/16 GMT-0300'),23)),
+    3:this.setDateToISO(hourExpiration(new Date('2023/09/16 GMT-0300'),23)),4:this.setDateToISO(hourExpiration(new Date('2023/09/23 GMT-0300'),23)),
+    5:this.setDateToISO(hourExpiration(new Date('2023/09/30 GMT-0300'),23)),6:this.setDateToISO(hourExpiration(new Date('2023/10/06 GMT-0300'),23))}
     this.start = this.start.bind(this)
     MessageBus.i.subscribe('control/html/ready', this.start)
   }
@@ -173,8 +173,6 @@
     return convertedT
   }
 
-
-
   getDateString(date){
     return date.toLocaleDateString('pt-BR', { hour12:false })
   }
@@ -184,7 +182,8 @@
   }
 
   async lockedLvls (wrapper, highest, limitLvl){
-    let i = parseInt(highest+1)
+    console.log(highest);
+    let i = parseInt(highest+1  )
     let released = true
     for (i; i <= limitLvl; i++) {
       // let labTemplate = await MessageBus.i.request(
@@ -212,6 +211,7 @@
     let labDelivered = false
     let labLastEdit = null
     const highestLab = Object.keys(labList).length
+    let nLabReleased = 0
     const currentDate = new Date()
     // console.log('============',this.convertToLocalTz(new Date(),'date'))
     // let tzOffset = this.prependZero(-1*(currentDate.getTimezoneOffset()/60))
@@ -226,7 +226,8 @@
     const lateReleaseTxt = 'Não publicado...(atraso)'
     progressWrapper.innerHTML = ''
     for (var i = 1; i <= Object.keys(this.labRelease).length; i++) {
-
+      labCompleted = false
+      labDelivered = false
       let labTemplate = await MessageBus.i.request(
         'data/template/' + `labs/lab_${i}`.replace(/\//g, '.') +
           '/get', {static: false}, null, true)
@@ -259,10 +260,10 @@
           .replace(/\[labNumber\]/ig, Object.keys(this.labRelease)[i-1])
           .replace(/\[progress\]/ig, 'Fechado')
           .replace(/\[progressColor\]/ig, labCompleted?successColor:'bg-lab-dark text-lab-light')
-          .replace(/\[this.labExpirationColor\]/ig, 'btn-lab-primary text-lab-light-pink')
+          .replace(/\[this.labExpirationColor\]/ig, 'bg-lab-dark text-lab-light-pink')
           .replace(/\[this.labExpiration\]/ig,
           `${this.convertToLocalTz(this.labExpiration[i],'string')}`)
-          .replace(/\[labDelivered\]/ig, labDelivered?'Sim':'Não')
+          .replace(/\[labDelivered\]/ig, labDelivered?'Sim!':'Não')
           .replace(/\[labDeliveredColor\]/ig, labDelivered?successColor:failColor)
           .replace(/\[labLastEdit\]/ig, labLastEdit)
           .replace(/\[labLastEditColor\]/ig, (failColor))
@@ -273,7 +274,7 @@
         .replace(/\[labNumber\]/ig, Object.keys(labList)[i-1])
         .replace(/\[progress\]/ig, 'Em aberto')
         .replace(/\[progressColor\]/ig, labCompleted?successColor:'bg-lab-dark text-lab-light')
-        .replace(/\[this.labExpirationColor\]/ig, 'btn-lab-primary text-lab-light-pink')
+        .replace(/\[this.labExpirationColor\]/ig, 'bg-lab-dark text-lab-light-pink')
         .replace(/\[this.labExpiration\]/ig,
         `${this.convertToLocalTz(this.labExpiration[i],'string')}`)
         .replace(/\[labDelivered\]/ig, labDelivered?'Sim!':'Não')
@@ -292,10 +293,10 @@
         .replace(/\[labNumber\]/ig, Object.keys(this.labRelease)[i-1])
         .replace(/\[progress\]/ig, 'Fechado')
         .replace(/\[progressColor\]/ig, labCompleted?successColor:'bg-lab-dark text-lab-light')
-        .replace(/\[this.labExpirationColor\]/ig, 'btn-lab-primary text-lab-light-pink')
+        .replace(/\[this.labExpirationColor\]/ig, 'bg-lab-dark text-lab-light-pink')
         .replace(/\[this.labExpiration\]/ig,
         `${this.convertToLocalTz(this.labExpiration[i],'string')}`)
-        .replace(/\[labDelivered\]/ig, labDelivered?'Sim':'Não')
+        .replace(/\[labDelivered\]/ig, labDelivered?'Sim!':'Não')
         .replace(/\[labDeliveredColor\]/ig, labDelivered?successColor:failColor)
         .replace(/\[labLastEdit\]/ig, labLastEdit)
         .replace(/\[labLastEditColor\]/ig, (failColor))
@@ -303,7 +304,7 @@
         if (released == false){
           template.innerHTML = labProgressManager.lvlContainerLocked
           .replace(/\[difficulty\]/ig, i)
-          .replace(/\[labRelease\]/ig, `${this.getDateStringthis(this.labRelease[i])}`)
+          .replace(/\[labRelease\]/ig, `${this.convertToLocalTz(this.labRelease[i],'string')}`)
           .replace(/\[labText\]/ig, lateReleaseTxt)
 
         }else{
@@ -314,15 +315,20 @@
           .replace(/\[labNumber\]/ig, Object.keys(this.labRelease)[i-1])
           .replace(/\[progress\]/ig, 'Em aberto')
           .replace(/\[progressColor\]/ig, labCompleted?successColor:'bg-lab-dark text-lab-light')
-          .replace(/\[this.labExpirationColor\]/ig, 'btn-lab-primary text-lab-light-pink')
+          .replace(/\[this.labExpirationColor\]/ig, 'bg-lab-dark text-lab-light-pink')
           .replace(/\[this.labExpiration\]/ig,
           `${this.convertToLocalTz(this.labExpiration[i],'string')}`)
-          .replace(/\[labDelivered\]/ig, labDelivered?'Sim':'Não')
+          .replace(/\[labDelivered\]/ig, labDelivered?'Sim!':'Não')
           .replace(/\[labDeliveredColor\]/ig, labDelivered?successColor:failColor)
           .replace(/\[labLastEdit\]/ig, labLastEdit)
           .replace(/\[labLastEditColor\]/ig, (failColor))
           .replace(/\[buttonIcon\]/ig, 'plus')
         }
+      }else if (currentDate < this.labRelease[i]){
+        template.innerHTML = labProgressManager.lvlContainerLocked
+        .replace(/\[difficulty\]/ig, i)
+        .replace(/\[labRelease\]/ig, `${this.convertToLocalTz(this.labRelease[i],'string')}`)
+        .replace(/\[labText\]/ig, 'Ainda não publicado...')
       }
 
       progressWrapper.appendChild(template.content.cloneNode(true))
@@ -363,7 +369,6 @@
         }
       }
 
-
     }
       let template = document.createElement('template')
       /*if(highestLab == '10'){
@@ -420,7 +425,7 @@
     }*/
 
     // lastAvailable(progressWrapper, highestLvl)
-    this.lockedLvls(progressWrapper, highestLab+1, 6)
+    // this.lockedLvls(progressWrapper, highestLab+nLabReleased, 6)
 
   }
 
diff --git a/src/adonisjs/public/author/env/inf331_2023/lab/index.html b/src/adonisjs/public/author/env/inf331_2023/lab/index.html
index 2f79ee38..dc3ea705 100644
--- a/src/adonisjs/public/author/env/inf331_2023/lab/index.html
+++ b/src/adonisjs/public/author/env/inf331_2023/lab/index.html
@@ -46,10 +46,12 @@
     <script src="/dccs/base/dcc-visual.js"></script>
 
     <script src="/infra/basic.js"></script>
+    <script src="/infra/dcc-basic-swe.js"></script>
+
     <script src="/infra/dcc-common-server-proxy.js"></script>
     <script src="/infra/dcc-common-server-address.js"></script>
     <script src="/infra/simple-page-tasks.js"></script>
-    <script src="/infra/token-validator.js"></script>
+    <script src="/infra/token-validator-swe.js"></script>
     <script src="/infra/conditional-layout.js"></script>
 
     <script src="/dccs/components/visual/dcc-markdown.js"></script>
@@ -96,7 +98,6 @@
     <script src="/dccs/components/web/dcc-rest.js"></script>
 
     <script src="/infra/dcc-rest-proxy.js"></script>
-    <script src="/infra/dcc-basic.js"></script>
 
     <script src="/lib/showdown/showdown.min.js"></script>
     <script src="/translator/translator.js"></script>
@@ -145,7 +146,51 @@ <h5 class="" id="modal-notice-txt"></h5>
       </div>
     </div>
     <!-- Login/logout header -->
-    <dcc-include src="/author/partials/header.html"></dcc-include>
+    <div class="fixed-top up-scroll" style="transition: top 0.3s !important;">
+      <dcc-rest id="harena-login" bind="harena-login"></dcc-rest>
+      <nav>
+          <div class="d-flex overflow-hidden pt-2 mr-4" id="harena-header">
+    
+          <span class="inline-flex rounded-md ml-auto " id="header-login">
+            <div id="login-block">
+                <button id="loginDropdownBtn" class="btn btn-light border-top border-left border-right text-primary pl-4 pt-1 dropdown-toggle " type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  Login
+                </button>
+                <form class="needs-validation dropdown-menu p-4 mr-5" novalidate>
+                  <div class="form-group">
+                    <label for="email">Email address</label>
+                    <input type="email" class="form-control" id="email" name="email" placeholder="email@example.com" required>
+                    <div class="invalid-feedback">
+                      Please type a valid email.
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <label for="password">Password</label>
+                    <input type="password" class="form-control" id="password" name="password" placeholder="Password" required>
+                  </div>
+                  <dcc-submit id="btn-submit-login" bind="submit-login" label="Login" xstyle="btn btn-outline-primary" connect="submit:harena-login:service/request/post"></dcc-submit>
+                  <div id="login-message-alert" class="alert mt-3" role="alert">
+                  </div>
+                </form>
+            </div>
+            <div id="logout-block" style="display: none;">
+              <dcc-rest id="harena-logout" bind="harena-logout"></dcc-rest>
+              <button id="logoutDropdownBtn" class="btn btn-light border-top border-left border-right text-lab-primary px-1 pt-1 dropdown-toggle " type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                Logout
+              </button>
+              <div class="dropdown-menu mr-5" aria-labelledby="logoutDropdownBtn">
+                <a class="dropdown-item" href="/user/settings">Change Password</a>
+                <div class="dropdown-divider"></div>
+    
+                <dcc-submit xstyle="dropdown-item" id="logout-button" bind="submit-logout" label="Logout" connect="submit:harena-logout:service/request/post">
+    
+                </div>
+            </div>
+          </span>
+        </div>
+      </nav>
+    </div>
+    <!-- <dcc-include src="/author/partials/header.html"></dcc-include> -->
     <dcc-rest id="harena-case" bind="harena-case" subscribe="service/request/get"></dcc-rest>
     <dcc-dhtml id="dhtml-case" subscribe="service/response/get/harena-case:update">
       <div class="modal fade" id="settings-modal" tabindex="-1" role="dialog" aria-labelledby="settings-modal" aria-hidden="true">
@@ -191,7 +236,7 @@ <h3>Settings</h3>
                     <label for="domain">Domain</label>
                     <select name="domain" id="domain" value="{{domain}}">
                       <option value="{{domain}}" selected disabled hidden>{{domain}}</option>
-                      <option value="Medicine">Medicine</option>
+                      <option value="Medicine">Medicine</option>1F2232
                       <option value="Nurse">Nurse</option>
                       <option value="Physioterapy">Physioterapy</option>
                       <option value="Pharmacy">Pharmacy</option>
@@ -404,15 +449,7 @@ <h5 class="" id="modal-notice-txt"></h5>
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb">
               <!-- <li class="breadcrumb-item"><a href="//home.html">Home</a></li> -->
-              <li class="breadcrumb-item"><a href="/">Welcome</a></li>
-              <li class="breadcrumb-item"><a href="/author/home">Home</a></li>
-              <li class="breadcrumb-item">
-                <div style="height: 15px;">
-                    <dcc-button topic="control/leave/drafts" label="Drafts" xstyle="none">
-                    </dcc-button>
-                </div>
-              </li>
-              <li class="breadcrumb-item active" aria-current="page">Edit case</li>
+              <button type="button" class="btn btn-lab-secondary rounded-pill" onclick="location.href='/author/env/inf331_2023'"><i class="fas fa-arrow-left"></i> Lista de Labs</button>
             </ol>
           </nav>
         </div>
@@ -421,7 +458,7 @@ <h5 class="" id="modal-notice-txt"></h5>
         <!-- Page title and description -->
         <div class="container-fluid">
           <dcc-dhtml subscribe="service/response/get/harena-case:update">
-            <h1>{{title}}</h1>
+            <h1 class="text-lab-primary">{{title}}</h1>
 
           </dcc-dhtml>
         </div>
@@ -432,7 +469,7 @@ <h1>{{title}}</h1>
              style="position:relative">
           <nav class="navbar navbar-light">
             <div class="col-6">
-              <button type="button" class="btn btn-secondary" id="btn-save-draft">Save</button>
+              <button type="button" class="btn btn-secondary btn-lab-save" id="btn-save-draft">Save</button>
               <dcc-button topic="control/case/save" location="btn-save-draft" label="Salvar rascunho" xstyle="out"></dcc-button>
 
               <div id="advanced-mode" style="display:none">
@@ -487,7 +524,7 @@ <h1>{{title}}</h1>
                 <div class="w-100">
                    <button id="scroll-to-top-btn" type="button" name="button" class="btn bg-secondary rounded-circle" ><i class="fas fa-arrow-up"></i></button>
                    <div id="toolbar-editor"></div>
-                   <div id="inplace-editor-wrapper" class="d-flex h-100 sticky-top std-border">
+                   <div id="inplace-editor-wrapper" class="d-flex h-100 sticky-top std-border border-lab-dark">
                      <div id="knot-panel" class="d-flex flex-column sty-knot-panel w-100 h-100 scroll-y">
 
                      </div>
diff --git a/src/adonisjs/public/index-swe.html b/src/adonisjs/public/index-swe.html
index 7b3bbcc0..32947b14 100644
--- a/src/adonisjs/public/index-swe.html
+++ b/src/adonisjs/public/index-swe.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="/author/css/author.css">
 
     <script src="/lib/axios-0.21.0/axios.min.js"></script>
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="/lib/jquery-3-4-1/jquery-3.4.1.slim.min.js"></script>
 
     <script src="/lib/jquery-3-4-1/jquery-3.4.1.slim.min.js"></script>
     <script src="/lib/popper-1-15-0/popper.min.js"></script>
@@ -64,6 +64,8 @@
     <link rel="stylesheet" href="/dccs/css/properties.css">
     <link rel="stylesheet" href="/infra/css/common-player.css">
     <link rel="stylesheet" href="/infra/css/common-author.css">
+    
+    <link rel="stylesheet" href="/author/env/inf331_2023/css/lab.css">
 
     <script src="author/js/dcc-author-server-proxy.js"></script>
 
@@ -84,33 +86,77 @@
 
   <body onload="TokenController.instance.checkToken()">
     <!-- Login/logout header -->
-    <dcc-include src="/author/partials/header.html"></dcc-include>
+    <div class="fixed-top up-scroll" style="transition: top 0.3s !important;">
+      <dcc-rest id="harena-login" bind="harena-login"></dcc-rest>
+      <nav>
+          <div class="d-flex overflow-hidden pt-2 mr-4" id="harena-header">
+    
+          <span class="inline-flex rounded-md ml-auto " id="header-login">
+            <div id="login-block">
+                <button id="loginDropdownBtn" class="btn btn-light border-top border-left border-right text-primary pl-4 pt-1 dropdown-toggle " type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  Login
+                </button>
+                <form class="needs-validation dropdown-menu p-4 mr-5" novalidate>
+                  <div class="form-group">
+                    <label for="email">Email address</label>
+                    <input type="email" class="form-control" id="email" name="email" placeholder="email@example.com" required>
+                    <div class="invalid-feedback">
+                      Please type a valid email.
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <label for="password">Password</label>
+                    <input type="password" class="form-control" id="password" name="password" placeholder="Password" required>
+                  </div>
+                  <dcc-submit id="btn-submit-login" bind="submit-login" label="Login" xstyle="btn btn-outline-primary" connect="submit:harena-login:service/request/post"></dcc-submit>
+                  <div id="login-message-alert" class="alert mt-3" role="alert">
+                  </div>
+                </form>
+            </div>
+            <div id="logout-block" style="display: none;">
+              <dcc-rest id="harena-logout" bind="harena-logout"></dcc-rest>
+              <button id="logoutDropdownBtn" class="btn btn-light border-top border-left border-right text-lab-primary px-1 pt-1 dropdown-toggle " type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                Logout
+              </button>
+              <div class="dropdown-menu mr-5" aria-labelledby="logoutDropdownBtn">
+                <a class="dropdown-item" href="/user/settings">Change Password</a>
+                <div class="dropdown-divider"></div>
+    
+                <dcc-submit xstyle="dropdown-item" id="logout-button" bind="submit-logout" label="Logout" connect="submit:harena-logout:service/request/post">
+    
+                </div>
+            </div>
+          </span>
+        </div>
+      </nav>
+    </div>
+    <!-- <dcc-include src="/author/partials/header.html"></dcc-include> -->
       <main>
         <div class="d-flex vh-100 vw-100" style="background-color: rgb(245,245,245);">
-          <div class="d-flex w-100 mx-5 home-image-margin" style="">
+          <div class="d-flex w-100 mx-5 home-image-margin border-lab-dark" style="">
 
             <div class="d-flex ml-auto flex-column align-items-center justify-content-center align-items-center">
               <div class="d-flex flex-column">
-                <h1 class="home-header-text">INF331 - Componentização e Reúso de Software 2023</h1>
-                <p class="home-p-text">Acesso à plataforma de Laboratórios.</p>
+                <h1 class="home-header-text text-lab-primary">INF331 - Componentização e Reúso de Software 2023</h1>
+                <p class="home-p-text text-lab-dark">Acesso à plataforma de Laboratórios.</p>
                 <div class="container-fluid">
                   <div class="row home-play-container">
-                    <button id="player-btn" class="btn col-4 ml-4 lets-play rounded-pill" onclick="location.href='/author/env/inf331_2023'">Labs</button>
+                    <button id="player-btn" class="btn col-4 ml-4 lets-play rounded-pill btn-lab-secondary" onclick="location.href='/author/env/inf331_2023'">Labs</button>
                   </div>
 
                 </div>
               </div>
             </div>
             <div class="d-flex ml-auto w-50 flex-column align-items-center justify-content-center"
-              style="background: url('start/img/background_harena.png');">
+              style="background: url('start/img/background_inf331.png');">
               <div>
-                <img src="start/img/home_harena.png" alt="" class="h-100 float-right" id="home-image"/>
+                <img src="start/img/home-image-inf331.png" alt="" class="h-100 float-right" id="home-image"/>
               </div>
             </div>
           </div>
         </div>
       </main>
-      <div id="version-footnote" class="fixed-bottom" style="text-align:center">
+      <div id="version-footnote" class="fixed-bottom text-lab-light" style="text-align:center">
       </div>
 
   </body>
diff --git a/src/adonisjs/public/infra/conditional-layout.js b/src/adonisjs/public/infra/conditional-layout.js
index a8e8a31d..b3bb9e4d 100644
--- a/src/adonisjs/public/infra/conditional-layout.js
+++ b/src/adonisjs/public/infra/conditional-layout.js
@@ -204,8 +204,8 @@ class LayoutController {
       if(userGrade === 'student'){
 
         dccSubmitProp.setAttribute('id','dcc-submit-feedback')
-        dccSubmitProp.setAttribute('bind','submit-case-property')
-        dccSubmitProp.setAttribute('xstyle','btn btn-secondary m-1')
+        dccSubmitProp.setAttribute('bind','submit-save-case-and-property')
+        dccSubmitProp.setAttribute('xstyle','btn btn-secondary btn-lab-primary m-1')
         dccSubmitProp.setAttribute('label', "Entregar")
         dccSubmitProp.setAttribute('topic','service/request/post')
         dccSubmitProp.setAttribute('data-toggle','tooltip')
@@ -332,7 +332,8 @@ class LayoutController {
         saveBtn.innerHTML = 'Data da entrega expirada'
         btnLabDelivered.firstElementChild.innerHTML = btnLabDelivered.firstElementChild.innerHTML == 'Entregar'?'Não entregue':'Entregue'
         saveBtn.classList.add('disabled')
-        saveBtn.nextElementSibling.remove()
+        saveBtn.classList.add('no-pointer')
+        saveBtn.nextElementSibling.topic = ""
       }
     }
     /*else if(userGrade === 'professor' || userGrade === 'coordinator'){
diff --git a/src/adonisjs/public/infra/dcc-basic-swe.js b/src/adonisjs/public/infra/dcc-basic-swe.js
index e933221e..8684e4f3 100644
--- a/src/adonisjs/public/infra/dcc-basic-swe.js
+++ b/src/adonisjs/public/infra/dcc-basic-swe.js
@@ -120,7 +120,6 @@
     {
       pos: async function (response) {
         // console.log('============ pos dcc-submit prop')
-        // console.log(response)
         let propValue = null
         if(response['harena-case-property']['case_property']){
           propValue = response['harena-case-property']['case_property']['value']
@@ -132,6 +131,29 @@
     }
   )
 
+  DCC.component(
+    'submit-save-case-and-property',
+    'dcc-submit',
+    {
+      pre: function (message, form, schema) {
+        const saveCase = document.querySelector(`button[id="btn-save-draft"]`)
+        saveCase.click()
+        return true
+      },
+      pos: async function (response) {
+        
+        // console.log(response)
+        let propValue = null
+        if(response['harena-case-property']['case_property']){
+          propValue = response['harena-case-property']['case_property']['value']
+        }else{
+          propValue = response['harena-case-property']['value']
+        }
+        LayoutController.instance.labDeliverButtonCaseState(propValue)
+      }
+    }
+  )
+
   DCC.component(
     'submit-filter',
     'dcc-submit',
@@ -210,401 +232,4 @@
     }
   )
 
-  DCC.component(
-    'submit-prognosis-lvl',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        var localStorageItem
-        if(new URL(document.location).pathname.includes('/learn')){
-          localStorageItem = 'prognosis-current-lvl'
-        }else if(new URL(document.location).pathname.includes('/challenge/1')) {
-          localStorageItem = 'prognosis-challenge1-current-lvl'
-        }else if(new URL(document.location).pathname.includes('/challenge/2')) {
-          localStorageItem = 'prognosis-challenge2-current-lvl'
-        }
-        // console.log('============ tak')
-        // console.log(localStorageItem)
-        if(document.querySelector('#current-lvl') && localStorage.getItem(localStorageItem)!= null){
-          let currentLvl = localStorage.getItem(localStorageItem)
-          message.value.propertyTitle = localStorageItem
-          message.value.propertyValue = currentLvl
-          return true
-        }else if(document.querySelector('#next-lvl') && localStorage.getItem(localStorageItem)!= null){
-          if(localStorage.getItem(localStorageItem) == parseInt(document.querySelector('#next-lvl').value)){
-            let nextLvl = parseInt(document.querySelector('#next-lvl').value) + 1
-            if(nextLvl>10)
-              nextLvl = 10
-            message.value.propertyTitle = localStorageItem
-            message.value.propertyValue = nextLvl
-            return true
-          }
-          return false
-
-
-        }else{
-          // console.log('============ error in prognosis lvl update in manager')
-          return false
-        }
-
-      },
-      pos: async function (response) {
-
-        if(document.querySelector('dcc-submit[bind="submit-prognosis-lvl"]'))
-          document.querySelector('dcc-submit[bind="submit-prognosis-lvl"]').remove()
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-lvl-result',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        if(form.checkValidity()){
-          currentLvl = localStorage.getItem('prognosis-current-lvl')
-          console.log(document.querySelector('#saps-survival'))
-          message.value.propertyTitle = `prognosis-lvl-${currentLvl}-result`
-          message.value.propertyValue = document.querySelector('#saps-survival').value
-          return true
-        }else{
-          return false
-        }
-      },
-      pos: async function (response) {
-
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-lvl-txt',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        if(new URL(document.location).pathname.includes('/learn')){
-          if(document.querySelector('#current-lvl') && localStorage.getItem('prognosis-current-lvl')!= null
-          && document.querySelector('#pacient-overview-wrapper > h5')){
-
-            const currentLvl = localStorage.getItem('prognosis-current-lvl')
-            const pacientOverview = document.querySelector('#pacient-abstract').value
-            message.value.propertyTitle = `prognosis-lvl-${currentLvl}-pacient`
-            message.value.propertyValue = pacientOverview
-            return true
-          }else{
-            return false
-          }
-        }else if(new URL(document.location).pathname.includes('/challenge/1')) {
-          if(document.querySelector('#current-lvl') && localStorage.getItem('prognosis-challenge1-current-lvl')!= null
-          && document.querySelector('#pacient-overview-wrapper > h5')){
-
-            const currentLvl = localStorage.getItem('prognosis-challenge1-current-lvl')
-            const pacientOverview = document.querySelector('#pacient-abstract').value
-            message.value.propertyTitle = `prognosis-challenge1-lvl-${currentLvl}-pacient`
-            message.value.propertyValue = pacientOverview
-            return true
-          }else{
-            return false
-          }
-        }else if(new URL(document.location).pathname.includes('/challenge/2')) {
-          if(document.querySelector('#current-lvl') && localStorage.getItem('prognosis-challenge1-current-lvl')!= null
-          && document.querySelector('#pacient-overview-wrapper > h5')){
-
-            const currentLvl = localStorage.getItem('prognosis-challenge1-current-lvl')
-            const pacientOverview = document.querySelector('#pacient-abstract').value
-            message.value.propertyTitle = `prognosis-challenge2-lvl-${currentLvl}-pacient`
-            message.value.propertyValue = pacientOverview
-            return true
-          }else{
-            return false
-          }
-        }
-      },
-      pos: async function (response) {
-        if(document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-txt"][connect$="/post"]`)){
-          document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-txt"][connect$="/post"]`).remove()
-          const submitDcc = document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-txt"][connect$="/put"]`)
-          submitDcc._computeTrigger()
-        }
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-lvl-guess',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        if(new URL(document.location).searchParams.get('playerCalc')
-        && new URL(document.location).searchParams.get('calc')){
-
-          let currentLvl = localStorage.getItem('prognosis-current-lvl')
-          let playerCalc = new URL(document.location).searchParams.get('playerCalc')
-          let sapsCalc = new URL(document.location).searchParams.get('calc')
-          let prognDiff = (parseFloat(playerCalc) - parseFloat(sapsCalc))
-
-          message.value.propertyTitle = `prognosis-lvl-${currentLvl}-best-guess`
-          message.value.propertyValue = prognDiff
-          return true
-        }else if(new URL(document.location).pathname.includes('challenge/1')){
-          let currentLvl = localStorage.getItem('prognosis-challenge1-current-lvl')
-          let playerCalc = document.querySelector('#player-prognosis-guess').dataset.value
-          let sapsCalc = document.querySelector('#prognosis-survival-pacient').dataset.value
-          let prognDiff = (parseFloat(playerCalc) - parseFloat(sapsCalc))
-
-          message.value.propertyTitle = `prognosis-challenge1-lvl-${currentLvl}-best-guess`
-          message.value.propertyValue = prognDiff
-          return true
-        }/*else if(new URL(document.location).pathname.includes('challenge/2')){
-          let currentLvl = localStorage.getItem('prognosis-challenge1-current-lvl')
-          let playerCalc = document.querySelector('#player-prognosis-guess').dataset.value
-          let sapsCalc = document.querySelector('#prognosis-survival-pacient').dataset.value
-          let prognDiff = (parseFloat(playerCalc) - parseFloat(sapsCalc))
-
-          message.value.propertyTitle = `prognosis-challenge2-lvl-${currentLvl}-best-guess`
-          message.value.propertyValue = prognDiff
-        }*/
-        else{
-          return false
-        }
-      },
-      pos: async function (response) {
-        let playerCalc
-        let sapsCalc
-        let prognDiff
-        if(new URL(document.location).pathname.includes('challenge')){
-          playerCalc = document.querySelector('#player-prognosis-guess').dataset.value
-          sapsCalc = document.querySelector('#prognosis-survival-pacient').dataset.value
-          prognDiff = (parseFloat(playerCalc) - parseFloat(sapsCalc))
-        }else{
-          playerCalc = new URL(document.location).searchParams.get('playerCalc')
-          sapsCalc = new URL(document.location).searchParams.get('calc')
-          prognDiff = (parseFloat(playerCalc) - parseFloat(sapsCalc))
-        }
-
-        if(document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-guess"][connect$="/post"]`)){
-          document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-guess"][connect$="/post"]`).remove()
-          if(Math.abs(response['harena-user-property'].userProperty.value) > Math.abs(prognDiff)){
-            const submitDcc = document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-guess"][connect$="/put"]`)
-            submitDcc._computeTrigger()
-          }
-        }
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-lvl-progn',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        if(new URL(document.location).searchParams.get('calc')){
-
-          const currentLvl = localStorage.getItem('prognosis-current-lvl')
-          const sapsCalc = new URL(document.location).searchParams.get('calc')
-
-          message.value.propertyTitle = `prognosis-lvl-${currentLvl}-best-progn`
-          message.value.propertyValue = parseFloat(sapsCalc)
-          return true
-        }else if(new URL(document.location).pathname.includes('challenge/2')){
-          const currentLvl = localStorage.getItem('prognosis-challenge2-current-lvl')
-          const sapsCalc = document.querySelector('#prognosis-survival-pacient').dataset.value
-
-          message.value.propertyTitle = `prognosis-challenge2-lvl-${currentLvl}-best-progn`
-          message.value.propertyValue = parseFloat(sapsCalc)
-          return true
-        }else{
-          return false
-        }
-      },
-      pos: async function (response) {
-        let sapsCalc
-        if(new URL(document.location).searchParams.get('calc'))
-          sapsCalc = new URL(document.location).searchParams.get('calc')
-        else
-         sapsCalc = document.querySelector('#prognosis-survival-pacient').dataset.value
-        if(document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-progn"][connect$="/post"]`)){
-          document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-progn"][connect$="/post"]`).remove()
-          if(response['harena-user-property'].userProperty.value < parseFloat(sapsCalc)){
-            const submitDcc = document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-progn"][connect$="/put"]`)
-            submitDcc._computeTrigger()
-          }
-        }
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-highest-lvl',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        var localStorageCurrent
-        var localStorageHighest
-        if(new URL(document.location).pathname.includes('/learn')){
-          localStorageCurrent = 'prognosis-current-lvl'
-          localStorageHighest = 'prognosis-highest-lvl'
-        }else if(new URL(document.location).pathname.includes('/challenge/1')) {
-          localStorageCurrent = 'prognosis-challenge1-current-lvl'
-          localStorageHighest = 'prognosis-challenge1-highest-lvl'
-        }else if(new URL(document.location).pathname.includes('/challenge/2')) {
-          localStorageCurrent = 'prognosis-challenge2-current-lvl'
-          localStorageHighest = 'prognosis-challenge2-highest-lvl'
-        }
-        var currentLvl
-        var highestLvl
-        var nextLvl = document.querySelector('#next-lvl')
-        if(localStorage.getItem(localStorageCurrent) && localStorage.getItem(localStorageHighest)){
-          if(nextLvl){
-            if(nextLvl.value == ''){
-              nextLvl.value = parseInt(localStorage.getItem(localStorageCurrent))+1 || 2
-            }
-            if(nextLvl.value == localStorage.getItem(localStorageHighest)
-            && parseInt(nextLvl.value) != 10){
-              if(parseInt(nextLvl.value) < 10){
-                highestLvl = parseInt(nextLvl.value) + 1
-              }else if(parseInt(nextLvl.value) > 10){
-                highestLvl = 10
-              }
-            }else{
-              highestLvl = parseInt(nextLvl.value)
-            }
-          }else{
-            if(parseInt(localStorage.getItem(localStorageCurrent))
-            >= parseInt(localStorage.getItem(localStorageHighest))){
-              if(parseInt(localStorage.getItem(localStorageCurrent)) <=10) {
-                currentLvl = parseInt(localStorage.getItem(localStorageCurrent))
-                highestLvl = currentLvl
-              }else{
-                localStorage.setItem(localStorageCurrent, 10)
-                localStorage.setItem(localStorageHighest, 10)
-                currentLvl = parseInt(localStorage.getItem(localStorageCurrent))
-                highestLvl = currentLvl
-              }
-            }else if (parseInt(localStorage.getItem(localStorageHighest)) > 10){
-              highestLvl = 10
-            }
-          }
-          if(new URL(document.location).pathname.includes('challenge')){
-            if ((parseInt(localStorage.getItem(localStorageHighest)) >= parseInt(localStorage.getItem(localStorageCurrent)))
-                && (parseInt(localStorage.getItem(localStorageHighest))>=document.querySelector('#highest-lvl').value)) {
-              highestLvl = localStorage.getItem(localStorageHighest)
-              message.value.propertyTitle = `${localStorageHighest}`
-              message.value.propertyValue = highestLvl
-              return true
-            }else{
-              return false
-            }
-          }else{
-            message.value.propertyTitle = `${localStorageHighest}`
-            message.value.propertyValue = highestLvl
-            return true
-          }
-        }else{
-          return false
-        }
-      },
-      pos: async function (response) {
-        var currentLvl
-        var highestLvl
-        if(new URL(document.location).pathname.includes('/learn')){
-          currentLvl = 'prognosis-current-lvl'
-          highestLvl = 'prognosis-highest-lvl'
-        }else if(new URL(document.location).pathname.includes('/challenge/1')) {
-          currentLvl = 'prognosis-challenge1-current-lvl'
-          highestLvl = 'prognosis-challenge1-highest-lvl'
-        }else if(new URL(document.location).pathname.includes('/challenge/2')) {
-          currentLvl = 'prognosis-challenge2-current-lvl'
-          highestLvl = 'prognosis-challenge2-highest-lvl'
-        }
-        localStorage.setItem(highestLvl, parseInt(response[Object.keys(response)[0]].userProperty.value))
-        if(document.querySelector(`dcc-submit[bind="submit-prognosis-highest-lvl"][connect$="/post"]`)){
-          document.querySelector(`dcc-submit[bind="submit-prognosis-highest-lvl"][connect$="/post"]`).remove()
-          if(parseInt(response[Object.keys(response)[0]].userProperty.value) < currentLvl
-          || parseInt(response[Object.keys(response)[0]].userProperty.value)>10){
-            const submitDcc = document.querySelector(`dcc-submit[bind="submit-prognosis-highest-lvl"][connect$="/put"]`)
-            submitDcc._computeTrigger()
-          }
-        }
-
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-perfect-lvl',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        const currentLvl = localStorage.getItem('prognosis-current-lvl')
-        const perfectScore = document.querySelector('#pacient-perfect')
-        if((currentLvl) && (perfectScore && perfectScore.value != '')){
-          message.value.propertyTitle = `prognosis-lvl-${currentLvl}-perfect`
-          message.value.propertyValue = perfectScore.value
-          return true
-        }else{
-          return false
-        }
-      },
-      pos: async function (response) {
-        const currentLvl = parseInt(localStorage.getItem('prognosis-current-lvl'))
-        const perfectScore = document.querySelector('#pacient-perfect')
-        if(document.querySelector(`dcc-submit[bind="submit-prognosis-perfect-lvl"][connect$="/post"]`)){
-          document.querySelector(`dcc-submit[bind="submit-prognosis-perfect-lvl"][connect$="/post"]`).remove()
-          if(parseFloat(response[Object.keys(response)[0]].userProperty.value) != parseFloat(perfectScore.value)){
-            const submitDcc = document.querySelector(`dcc-submit[bind="submit-prognosis-perfect-lvl"][connect$="/put"]`)
-            submitDcc._computeTrigger()
-          }
-        }
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-lvl-range',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        if(new URL(document.location).pathname.includes('challenge/2')){
-          const currentLvl = localStorage.getItem('prognosis-challenge2-current-lvl')
-          const range = document.querySelector('#prognosis-range').dataset.value
-
-          message.value.propertyTitle = `prognosis-challenge2-lvl-${currentLvl}-range`
-          message.value.propertyValue = range
-          return true
-        }else{
-          return false
-        }
-      },
-      pos: async function (response) {
-        const range = document.querySelector('#prognosis-range').dataset.value
-        if(document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-range"][connect$="/post"]`)){
-          document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-range"][connect$="/post"]`).remove()
-          if(response['harena-user-property'].userProperty.value != range){
-            const submitDcc = document.querySelector(`dcc-submit[bind="submit-prognosis-lvl-range"][connect$="/put"]`)
-            submitDcc._computeTrigger()
-          }
-        }
-      }
-    }
-  )
-
-  DCC.component(
-    'submit-prognosis-avatar-player',
-    'dcc-submit',
-    {
-      pre: function (message, form, schema) {
-        if(PrognosisAvatar.i._avatarActive){
-          const avatarId = PrognosisAvatar.i._avatarActive
-          message.value.propertyTitle = `prognosis-avatar-id`
-          message.value.propertyValue = avatarId
-          return true
-        }else{
-          return false
-        }
-      },
-      pos: async function (response) {
-      }
-    }
-  )
 })()
diff --git a/src/adonisjs/public/start/img/background_inf331-2.png b/src/adonisjs/public/start/img/background_inf331-2.png
new file mode 100644
index 00000000..3354a9a7
Binary files /dev/null and b/src/adonisjs/public/start/img/background_inf331-2.png differ
diff --git a/src/adonisjs/public/start/img/background_inf331.png b/src/adonisjs/public/start/img/background_inf331.png
new file mode 100644
index 00000000..520e6383
Binary files /dev/null and b/src/adonisjs/public/start/img/background_inf331.png differ
diff --git a/src/adonisjs/public/start/img/home-image-inf331.png b/src/adonisjs/public/start/img/home-image-inf331.png
new file mode 100644
index 00000000..c1d5ce23
Binary files /dev/null and b/src/adonisjs/public/start/img/home-image-inf331.png differ
diff --git a/src/adonisjs/public/templates/labs/lab3/ai-screen.png b/src/adonisjs/public/templates/labs/lab3/ai-screen.png
new file mode 100644
index 00000000..08d1c172
Binary files /dev/null and b/src/adonisjs/public/templates/labs/lab3/ai-screen.png differ
diff --git a/src/adonisjs/public/templates/labs/lab3/ai-script.png b/src/adonisjs/public/templates/labs/lab3/ai-script.png
new file mode 100644
index 00000000..1312779f
Binary files /dev/null and b/src/adonisjs/public/templates/labs/lab3/ai-script.png differ
diff --git a/src/adonisjs/public/templates/labs/lab3/ai-tree.png b/src/adonisjs/public/templates/labs/lab3/ai-tree.png
new file mode 100644
index 00000000..f99e38be
Binary files /dev/null and b/src/adonisjs/public/templates/labs/lab3/ai-tree.png differ
diff --git a/src/adonisjs/public/templates/labs/lab_3-dynamic.md b/src/adonisjs/public/templates/labs/lab_3-dynamic.md
new file mode 100644
index 00000000..4c5d67bc
--- /dev/null
+++ b/src/adonisjs/public/templates/labs/lab_3-dynamic.md
@@ -0,0 +1,71 @@
+# Tarefa 1 #
+
+<h1>MVC - Componentes View no App Inventor</h1>
+<h1>Tarefa 1</h1>
+
+{{explica
+* Construa um App no MIT App Inventor que mostre a imagem de uma receita e um botão `[Receita]`.
+* Quando o botão é clicado, deve ser apresentada a receita.
+}}
+
+{{figura1
+<h2>Coloque a figura com a captura do aplicativo funcionando.</h2>
+}}
+
+<br>
+
+{{figura2
+<h2>Coloque a figura com a captura da hierarquia de componentes visuais (composite).</h2>
+}}
+
+<br>
+
+{{figura3
+<h2>Coloque a figura com a captura dos scripts em box programming.</h2>
+}}
+
+
+# Tarefa 2 #
+
+<h1>MVC - Componentes Model no App Inventor</h1>
+<h1>Tarefa 2</h1>
+
+{{explica
+* Modifique o App apresentado no vídeo "MVC - Componentes Model no App Inventor" de modo que seja possível cadastrar (em um campo separado) o título da receita.
+* O título deve ser gravado no CloudDB com o rótulo título.
+}}
+
+{{figura1
+<h2>Coloque a figura com a captura do aplicativo funcionando.</h2>
+}}
+
+<br>
+
+{{figura2
+<h2>Coloque a figura com a captura da hierarquia de componentes visuais (composite).</h2>
+}}
+
+<br>
+
+{{figura3
+<h2>Coloque a figura com a captura dos scripts em box programming.</h2>
+}}
+
+# Apresenta #
+
+<h1>Apresentação do Resultado das Tarefas</h1>
+
+Você deve capturar:
+* a tela do aplicativo apresentando o resultado final - pode ser do emulador ou do celular;
+* a hierarquia de componentes visuais (padrão composite);
+* todos os scripts do app (na forma de caixinhas).
+
+As figuras são colocadas de forma separada (como no exemplo abaixo). Coloque figuras em que as coisas fiquem legíveis, mesmo que a figura fique grande. Exemplo:
+
+![Result Screen](template_fix/labs/lab3/ai-screen.png)
+![Composite Tree](template_fix/labs/lab3/ai-tree.png)
+![Script](template_fix/labs/lab3/ai-script.png)
+
+___ Template ___
+
+* template: labs/lab_3
diff --git a/src/adonisjs/public/templates/labs/lab_3-static.md b/src/adonisjs/public/templates/labs/lab_3-static.md
new file mode 100644
index 00000000..9026b7b4
--- /dev/null
+++ b/src/adonisjs/public/templates/labs/lab_3-static.md
@@ -0,0 +1,8 @@
+___ Flow ___
+
+* Sequential:
+  * _sequential_
+
+___ Data ___
+
+* theme: simple(blue)
diff --git a/src/adonisjs/public/templates/templates.json b/src/adonisjs/public/templates/templates.json
index 5b9efc43..4208471f 100644
--- a/src/adonisjs/public/templates/templates.json
+++ b/src/adonisjs/public/templates/templates.json
@@ -11,13 +11,20 @@
     "path": "labs/lab_1",
     "icon": "labs/labs.png",
     "scope": "case",
-    "environment": "jacinto"},
+    "environment": "development"},
 "Lab 2":
    {"questId": "labs",
     "description": "Lab 2.",
     "path": "labs/lab_2",
     "icon": "labs/labs.png",
     "scope": "case",
+    "environment": "development"},
+"Lab 3":
+   {"questId": "labs",
+    "description": "Lab 3.",
+    "path": "labs/lab_3",
+    "icon": "labs/labs.png",
+    "scope": "case",
     "environment": "jacinto"},
 "Zombie":
     {"questId": "zombie",
diff --git a/src/adonisjs/public/user/index-swe.html b/src/adonisjs/public/user/index-swe.html
index 193df9ee..33eb824c 100644
--- a/src/adonisjs/public/user/index-swe.html
+++ b/src/adonisjs/public/user/index-swe.html
@@ -6,36 +6,36 @@
   <head>
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" name="viewport">
     <!-- @include('layout.template-min') -->
-    <link rel="stylesheet" href="../lib/fontawesome-5-10-1/css/all.min.css">
-    <link rel="stylesheet" href="../lib/bootstrap-4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/lib/fontawesome-5-10-1/css/all.min.css">
+    <link rel="stylesheet" href="/lib/bootstrap-4.4.1/css/bootstrap.min.css">
 
-    <link rel="stylesheet" href="../infra/css/common-player.css">
-    <link rel="stylesheet" href="../infra/css/common-author.css">
+    <link rel="stylesheet" href="/infra/css/common-player.css">
+    <link rel="stylesheet" href="/infra/css/common-author.css">
 
-    <script src="../lib/axios-0.21.0/axios.min.js"></script>
+    <script src="/lib/axios-0.21.0/axios.min.js"></script>
 
-    <script src="../config/config.js"></script>
-    <script src="../dccs/infra/bus.js"></script>
+    <script src="/config/config.js"></script>
+    <script src="/dccs/infra/bus.js"></script>
 
-    <script src="../dccs/base/primitive-dcc.js"></script>
-    <script src="../dccs/base/scope-dcc.js"></script>
-    <script src="../dccs/base/dcc.js"></script>
-    <script src="../dccs/base/dcc-base.js "></script>
-    <script src="../dccs/base/dcc-visual.js "></script>
+    <script src="/dccs/base/primitive-dcc.js"></script>
+    <script src="/dccs/base/scope-dcc.js"></script>
+    <script src="/dccs/base/dcc.js"></script>
+    <script src="/dccs/base/dcc-base.js "></script>
+    <script src="/dccs/base/dcc-visual.js "></script>
 
-    <script src="../infra/basic.js"></script>
-    <script src="../infra/dcc-common-server-proxy.js"></script>
-    <script src="../infra/dcc-common-server-address.js"></script>
-    <script src="../author/js/dcc-author-server-proxy.js "></script>
+    <script src="/infra/basic.js"></script>
+    <script src="/infra/dcc-common-server-proxy.js"></script>
+    <script src="/infra/dcc-common-server-address.js"></script>
+    <script src="/author/js/dcc-author-server-proxy.js "></script>
 
-    <script src="../dccs/base/dcc-block.js"></script>
-    <script src="../dccs/components/visual/dcc-button.js"></script>
-    <script src="../dccs/components/data/dcc-submit.js"></script>
-    <script src="../dccs/components/web/dcc-rest.js"></script>
-    <script src="../dccs/components/visual/dcc-notice-input.js"></script>
+    <script src="/dccs/base/dcc-block.js"></script>
+    <script src="/dccs/components/visual/dcc-button.js"></script>
+    <script src="/dccs/components/data/dcc-submit.js"></script>
+    <script src="/dccs/components/web/dcc-rest.js"></script>
+    <script src="/dccs/components/visual/dcc-notice-input.js"></script>
 
-    <script src="../infra/dcc-basic-swe.js"></script>
-    <script src="../infra/dcc-rest-proxy.js"></script>
+    <script src="/infra/dcc-basic-swe.js"></script>
+    <script src="/infra/dcc-rest-proxy.js"></script>
 
   </head>
   <body>