diff --git a/composer.lock b/composer.lock
index 94931511abc3c685f146413d1c67ba6985f587c6..6e2dc1951e8de202fa04d3f497ea68fe15367a3d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1259,16 +1259,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.48.0",
+            "version": "2.48.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "d3c447f21072766cddec3522f9468a5849a76147"
+                "reference": "8d1f50f1436fb4b05e7127360483dd9c6e73da16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3c447f21072766cddec3522f9468a5849a76147",
-                "reference": "d3c447f21072766cddec3522f9468a5849a76147",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8d1f50f1436fb4b05e7127360483dd9c6e73da16",
+                "reference": "8d1f50f1436fb4b05e7127360483dd9c6e73da16",
                 "shasum": ""
             },
             "require": {
@@ -1348,7 +1348,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-07T10:08:30+00:00"
+            "time": "2021-05-26T22:08:38+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -2081,16 +2081,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.23",
+            "version": "v4.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f"
+                "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
-                "reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d",
+                "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d",
                 "shasum": ""
             },
             "require": {
@@ -2150,7 +2150,7 @@
             "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/console/tree/v4.4.23"
+                "source": "https://github.com/symfony/console/tree/v4.4.24"
             },
             "funding": [
                 {
@@ -2166,20 +2166,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-10T12:53:15+00:00"
+            "time": "2021-05-13T06:28:07+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.2.7",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb"
+                "reference": "5d5f97809015102116208b976eb2edb44b689560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/59a684f5ac454f066ecbe6daecce6719aed283fb",
-                "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5d5f97809015102116208b976eb2edb44b689560",
+                "reference": "5d5f97809015102116208b976eb2edb44b689560",
                 "shasum": ""
             },
             "require": {
@@ -2215,7 +2215,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.3.0-BETA1"
+                "source": "https://github.com/symfony/css-selector/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -2231,7 +2231,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-07T16:07:52+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "symfony/debug",
@@ -2602,16 +2602,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.23",
+            "version": "v4.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "67b77716f517e3f864759232e1201e7aa2ab0e82"
+                "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/67b77716f517e3f864759232e1201e7aa2ab0e82",
-                "reference": "67b77716f517e3f864759232e1201e7aa2ab0e82",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983",
+                "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983",
                 "shasum": ""
             },
             "require": {
@@ -2643,7 +2643,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v4.4.23"
+                "source": "https://github.com/symfony/finder/tree/v4.4.24"
             },
             "funding": [
                 {
@@ -2659,7 +2659,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-09T09:13:09+00:00"
+            "time": "2021-05-16T12:27:45+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -2809,16 +2809,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.4.23",
+            "version": "v4.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "95bb42312503a212f4467529bac8735f01226ff9"
+                "reference": "59925ee79f2541b4c6e990843e1a42768e898254"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/95bb42312503a212f4467529bac8735f01226ff9",
-                "reference": "95bb42312503a212f4467529bac8735f01226ff9",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/59925ee79f2541b4c6e990843e1a42768e898254",
+                "reference": "59925ee79f2541b4c6e990843e1a42768e898254",
                 "shasum": ""
             },
             "require": {
@@ -2893,7 +2893,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v4.4.23"
+                "source": "https://github.com/symfony/http-kernel/tree/v4.4.24"
             },
             "funding": [
                 {
@@ -2909,20 +2909,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-12T13:13:32+00:00"
+            "time": "2021-05-19T12:12:19+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.2.7",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "7af452bf51c46f18da00feb32e1ad36db9426515"
+                "reference": "64258e870f8cc75c3dae986201ea2df58c210b52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515",
-                "reference": "7af452bf51c46f18da00feb32e1ad36db9426515",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/64258e870f8cc75c3dae986201ea2df58c210b52",
+                "reference": "64258e870f8cc75c3dae986201ea2df58c210b52",
                 "shasum": ""
             },
             "require": {
@@ -2976,7 +2976,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.2.7"
+                "source": "https://github.com/symfony/mime/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -2992,20 +2992,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-29T20:47:09+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                 "shasum": ""
             },
             "require": {
@@ -3017,7 +3017,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3055,7 +3055,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3071,20 +3071,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342"
+                "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342",
-                "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
+                "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
                 "shasum": ""
             },
             "require": {
@@ -3096,7 +3096,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3135,7 +3135,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3151,20 +3151,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-05-27T09:27:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483"
+                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
-                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
+                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
                 "shasum": ""
             },
             "require": {
@@ -3178,7 +3178,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3222,7 +3222,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3238,20 +3238,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-05-27T09:27:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
                 "shasum": ""
             },
             "require": {
@@ -3263,7 +3263,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3306,7 +3306,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3322,20 +3322,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
+                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
+                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
                 "shasum": ""
             },
             "require": {
@@ -3347,7 +3347,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3386,7 +3386,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3402,20 +3402,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-05-27T09:27:20+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
+                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
-                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
+                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
                 "shasum": ""
             },
             "require": {
@@ -3424,7 +3424,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3462,7 +3462,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3478,20 +3478,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-05-27T09:17:38+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"
+                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
-                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
+                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
                 "shasum": ""
             },
             "require": {
@@ -3500,7 +3500,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3541,7 +3541,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3557,20 +3557,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
+                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
+                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
                 "shasum": ""
             },
             "require": {
@@ -3579,7 +3579,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3624,7 +3624,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -3640,7 +3640,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/process",
@@ -3705,16 +3705,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v4.4.22",
+            "version": "v4.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "049e7c5c41f98511959668791b4adc0898a821b3"
+                "reference": "b42c3631fd9e3511610afb2ba081ea7e38d9fa38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3",
-                "reference": "049e7c5c41f98511959668791b4adc0898a821b3",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/b42c3631fd9e3511610afb2ba081ea7e38d9fa38",
+                "reference": "b42c3631fd9e3511610afb2ba081ea7e38d9fa38",
                 "shasum": ""
             },
             "require": {
@@ -3773,7 +3773,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v4.4.22"
+                "source": "https://github.com/symfony/routing/tree/v4.4.24"
             },
             "funding": [
                 {
@@ -3789,7 +3789,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-11T12:59:39+00:00"
+            "time": "2021-05-16T09:52:47+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -3872,16 +3872,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v4.4.23",
+            "version": "v4.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "ff6e63c7b5de874464642969968f61f8dc649ac3"
+                "reference": "424d29dfcc15575af05196de0100d7b52f650602"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/ff6e63c7b5de874464642969968f61f8dc649ac3",
-                "reference": "ff6e63c7b5de874464642969968f61f8dc649ac3",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/424d29dfcc15575af05196de0100d7b52f650602",
+                "reference": "424d29dfcc15575af05196de0100d7b52f650602",
                 "shasum": ""
             },
             "require": {
@@ -3940,7 +3940,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v4.4.23"
+                "source": "https://github.com/symfony/translation/tree/v4.4.24"
             },
             "funding": [
                 {
@@ -3956,7 +3956,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-28T06:59:52+00:00"
+            "time": "2021-05-16T09:52:47+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -4438,16 +4438,16 @@
         },
         {
             "name": "facade/ignition",
-            "version": "1.16.15",
+            "version": "1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/ignition.git",
-                "reference": "b6aea4a99303d9d32afd486a285162a89af8a8a3"
+                "reference": "dc49305538aeb77e4c89eba57cee4ceff9e42f33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition/zipball/b6aea4a99303d9d32afd486a285162a89af8a8a3",
-                "reference": "b6aea4a99303d9d32afd486a285162a89af8a8a3",
+                "url": "https://api.github.com/repos/facade/ignition/zipball/dc49305538aeb77e4c89eba57cee4ceff9e42f33",
+                "reference": "dc49305538aeb77e4c89eba57cee4ceff9e42f33",
                 "shasum": ""
             },
             "require": {
@@ -4510,7 +4510,7 @@
                 "issues": "https://github.com/facade/ignition/issues",
                 "source": "https://github.com/facade/ignition"
             },
-            "time": "2021-02-15T10:21:49+00:00"
+            "time": "2021-05-25T07:15:52+00:00"
         },
         {
             "name": "facade/ignition-contracts",
diff --git a/config/app.php b/config/app.php
index 3c45c548564ea1343c1ddd482d018c948e4d98ab..acf78c07e3bc70bd9aa1f224bc817bdfcb757be8 100644
--- a/config/app.php
+++ b/config/app.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'name' => env('APP_NAME', 'Laravel'),
+    'name' => env('APP_NAME', 'Submeta'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/database/migrations/2020_02_05_123048_create_trabalhos_table.php b/database/migrations/2020_02_05_123048_create_trabalhos_table.php
index ec365264bccb53b2a1d931a27d66f7ef98055416..61e12ef4ac649d24301a13d44f7924b927e26e05 100644
--- a/database/migrations/2020_02_05_123048_create_trabalhos_table.php
+++ b/database/migrations/2020_02_05_123048_create_trabalhos_table.php
@@ -18,7 +18,7 @@ class CreateTrabalhosTable extends Migration
             $table->string('titulo');
             $table->string('status')->nullable();
             $table->string('aprovado')->nullable();
-            $table->string('linkGrupoPesquisa');
+            $table->string('linkGrupoPesquisa')->nullable();
             $table->string('linkLattesEstudante');
             $table->string('pontuacaoPlanilha');
             $table->date('data')->nullable();
@@ -33,7 +33,7 @@ class CreateTrabalhosTable extends Migration
             //chaves estrangeiras
             $table->unsignedBigInteger('grande_area_id');
             $table->unsignedBigInteger('area_id');
-            $table->unsignedBigInteger('sub_area_id');
+            $table->unsignedBigInteger('sub_area_id')->nullable();
             $table->unsignedBigInteger('evento_id');
             $table->unsignedBigInteger('coordenador_id');
             $table->unsignedBigInteger('proponente_id');
diff --git a/public/css/layout.css b/public/css/layout.css
index a6264edcd738eb94d36d997418c65bca3bd5517e..0af735b4d6810740fdbce972797974389d95398c 100644
--- a/public/css/layout.css
+++ b/public/css/layout.css
@@ -25,13 +25,9 @@ body{
   background-color: rgb(0, 140, 255);;
   border-color: rgb(0, 140, 255);;
 }
-.btn-primary:hover{
-  background-color: rgb(212, 216, 219);
-  border-color: rgb(212, 216, 219);
-}
+
 
 .card{
-  margin: 20px;
   box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.2);
   transition: 0.2s;
 }
@@ -143,10 +139,7 @@ body{
   border-radius: 10px;
 }
 
-.btn:hover {
-  background-color: rgb(212, 216, 219);
-  color: black;
-}
+
 
 .negrito {
   font-weight: bolder;
@@ -493,4 +486,15 @@ button.close {
 
 .btn-cadastro:hover {
   color: black;
+}
+
+.bottomVoltar{
+  display: none;
+  margin-right:10px;
+}
+@media screen and (max-width: 767px){
+  .bottomVoltar{
+      display: block;
+      margin-right:10px;
+  }
 }
\ No newline at end of file
diff --git a/public/css/style.css b/public/css/style.css
index c0a4db27cfbe1f2742b6e1eb9ab15174dcca375e..21512b1b27458af3daa9f58865dee9d163f2b9ef 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -82,14 +82,7 @@ body{
     padding: 7px;
 }
 
-.card{
-    margin: 20px;
-    box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.2);
-    transition: 0.2s;
-}
-.card:hover{
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
+
 .titulo{
     margin:7% 0 2% 0;
     border-bottom: 2px solid #ccc;
diff --git a/public/img/icons/icon_edital.png b/public/img/icons/icon_edital.png
new file mode 100644
index 0000000000000000000000000000000000000000..832180beb5a6076568d8761400357a053d2162a5
Binary files /dev/null and b/public/img/icons/icon_edital.png differ
diff --git a/public/img/icons/icon_enviar_proposta.png b/public/img/icons/icon_enviar_proposta.png
new file mode 100644
index 0000000000000000000000000000000000000000..85847035e9f75207dfbb605906df45faf45db203
Binary files /dev/null and b/public/img/icons/icon_enviar_proposta.png differ
diff --git a/public/img/icons/icon_minhas_propostas.png b/public/img/icons/icon_minhas_propostas.png
new file mode 100644
index 0000000000000000000000000000000000000000..51d18181203fd3b6e7e862dee843cfdcc55760ce
Binary files /dev/null and b/public/img/icons/icon_minhas_propostas.png differ
diff --git a/public/img/icons/icon_modelo.png b/public/img/icons/icon_modelo.png
new file mode 100644
index 0000000000000000000000000000000000000000..36ee0e6c3fca5cc4791ad057d6f8192588593a50
Binary files /dev/null and b/public/img/icons/icon_modelo.png differ
diff --git a/public/img/icons/icon_recurso.png b/public/img/icons/icon_recurso.png
new file mode 100644
index 0000000000000000000000000000000000000000..514cbdb5fe15132257c769a531a601c521f83a54
Binary files /dev/null and b/public/img/icons/icon_recurso.png differ
diff --git a/public/img/icons/icon_resultado_final.png b/public/img/icons/icon_resultado_final.png
new file mode 100644
index 0000000000000000000000000000000000000000..14e6a249dafa781ac5660809129be293d2b76407
Binary files /dev/null and b/public/img/icons/icon_resultado_final.png differ
diff --git a/public/img/icons/icon_resultado_preliminar.png b/public/img/icons/icon_resultado_preliminar.png
new file mode 100644
index 0000000000000000000000000000000000000000..6de07dcd0d81194cc1260c4adb3f0818cbfd8a5a
Binary files /dev/null and b/public/img/icons/icon_resultado_preliminar.png differ
diff --git a/public/img/icons/icon_revisao.png b/public/img/icons/icon_revisao.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d5b9df56640ba9debaa1029d25af63e7ffe42a
Binary files /dev/null and b/public/img/icons/icon_revisao.png differ
diff --git a/public/img/icons/icon_submissao.png b/public/img/icons/icon_submissao.png
new file mode 100644
index 0000000000000000000000000000000000000000..913533a03e550f9bf82958d05e105ae97c1b0dd9
Binary files /dev/null and b/public/img/icons/icon_submissao.png differ
diff --git a/public/img/icons/logo_esquerda.png b/public/img/icons/logo_esquerda.png
new file mode 100644
index 0000000000000000000000000000000000000000..be7cc0bb5f4f583e245943c6502d287c98cd8e9c
Binary files /dev/null and b/public/img/icons/logo_esquerda.png differ
diff --git a/public/img/icons/logo_lupa2.png b/public/img/icons/logo_lupa2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d72eb0eda42780f8d1f5f35b7abe4f7ba85935d3
Binary files /dev/null and b/public/img/icons/logo_lupa2.png differ
diff --git a/public/img/icons/logo_projeto.png b/public/img/icons/logo_projeto.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfffadd6663f2496bac2e82431a65c30142a3ace
Binary files /dev/null and b/public/img/icons/logo_projeto.png differ
diff --git a/public/img/img_fundo.png b/public/img/img_fundo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7fa9d1c8ac1a1e32600a987868c109b1c4b9b29
Binary files /dev/null and b/public/img/img_fundo.png differ
diff --git a/public/img/img_fundo_2.png b/public/img/img_fundo_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1208f5be139755c2ff6af35f350d3f9fcca6ea9
Binary files /dev/null and b/public/img/img_fundo_2.png differ
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index fb22d2fa8f80505685a04a6d6c749ee61c2a4a4a..a4cf5cf9968860badf602ae92ff8f8cdb915bb32 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,20 +1,20 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container content" style="margin-top: 40px;">
+<div class="container content">
     <div class="row justify-content-center">
-        <div class="col-md-5">
-            <div class="card card-login-cadastro">
-                {{-- <div class="card-header">{{ __('Login') }}</div> --}}
+        <div class="col-md-5" style="margin-top: 5rem">
+            <div class="card shadow bg-white" style="border-radius: 12px">
+                <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                    <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                      <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Entrar</h5>
+                    </div>
+                  </div>
 
                 <div class="card-body" style="font-weight: bolder;">
                     <form method="POST" action="{{ route('login') }}">
                         @csrf
 
-                        <div class="row justify-content-center">
-                            <div class="titulo-login-cadastro" style="margin-top: 20px; margin-bottom: 20px; font-size: 20px; color: rgb(0, 140, 255);">{{ __('Login') }}</div>
-                        </div>
-
                         <div class="form-group row">
                             
                             <div class="col-md-12">
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 976552e89225dc6e56664e32ec792a90fbfdc397..c875fe995c1a507d3514556953290a2ed3fb69d1 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,11 +1,15 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container content">
+<div class="container content" style="margin-top: 3rem">
     <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Redefinir Senha') }}</div>
+        <div class="col-md-8" style="margin-bottom:20px">
+            <div class="card shadow bg-white" style="border-radius:12px; border-width:0px;">
+                <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                    <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                        <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Redefinir Senha</h5>
+                    </div>    
+                </div>
 
                 <div class="card-body">
                     @if (session('status'))
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 14cd261326699131ee38829eedebe455066035a2..a279c64b373346111536a0e00e13ce9adaa8b904 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -1,274 +1,295 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container content">
-    <div class="row titulo">
-        <h1>Cadastro</h1>
-    </div>
-
-    <div class="row subtitulo">
-        <div class="col-sm-12">
-            <p>Informações Pessoais</p>
-        </div>
-    </div>
 
+<div class="container" style="margin-top: 3rem">
     <form method="POST" action="{{ route('register') }}">
         @csrf
-        {{-- Nome | CPF --}}
-        <div class="form-group row">
-
-            <div class="col-md-8">
-                <label for="name" class="col-form-label">{{ __('Nome Completo*') }}</label>
-                <input id="name" type="text" class="form-control @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" required autocomplete="name" autofocus>
-
-                @error('name')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-
-            <div class="col-md-4">
-                <label for="cpf" class="col-form-label">{{ __('CPF*') }}</label>
-                <input id="cpf" type="text" class="form-control @error('cpf') is-invalid @enderror" name="cpf" value="{{ old('cpf') }}" required autocomplete="cpf" autofocus>
-
-                @error('cpf')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-        </div>
-        {{-- Instituição de Ensino e Celular --}}
-        <div class="form-group row">
-            <div class="col-md-8">
-                <label for="instituicao" class="col-form-label">{{ __('Instituição de Vínculo*') }}</label>
-               <select style="display: inline" onchange="showInstituicao()" class="form-control @error('instituicaoSelect') is-invalid @enderror" name="instituicaoSelect" id="instituicaoSelect">
-                    <option value="" disabled selected hidden>-- Instituição --</option>
-                    <option @if(old('instituicaoSelect')=='UFAPE' ) selected @endif value="UFAPE">Universidade Federal do Agreste de Pernambuco - UFAPE</option>
-                    <option @if(old('instituicaoSelect')=='Outra' ) selected @endif value="Outra" >Outra</option>
-                </select>
-
-              
-                @error('instituicaoSelect')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>   
-            <div class='col-md-6' style='display:none'>
-                <label for="instituicao" class="col-form-label">{{ __('Digite a Instituição*') }}</label>
-                <input id="instituicao" type="text" class="form-control @error('instituicao') is-invalid @enderror" name="instituicao" value="{{ old('instituicao') }}" placeholder="Digite o nome da Instituição" autocomplete="instituicao" autofocus>
-                @error('instituicao')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>        
-            <div class="col-md-4">
-                <label for="celular" class="col-form-label">{{ __('Celular*') }}</label>
-                <input id="celular" type="text" class="form-control @error('celular') is-invalid @enderror" name="celular" value="{{ old('celular') }}" required autocomplete="celular" autofocus>
-
-                @error('celular')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-
-        </div>
-
-        {{-- Email | Senha | Confirmar Senha --}}
-        <div class="form-group row">
-
-            <div class="col-md-4">
-                <label for="email" class="col-form-label">{{ __('E-Mail*') }}</label>
-                <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">
-
-                @error('email')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-
-            <div class="col-md-4">
-                <label for="password" class="col-form-label">{{ __('Senha*') }}</label>
-                <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
-
-                @error('password')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-
-            <div class="col-md-4">
-                <label for="password-confirm" class="col-form-label">{{ __('Confirme a Senha*') }}</label>
-                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
-            </div>
-
-        </div>
-
-        <div class="form-group row">
-            <div class="col-md-4">
-                <label for="cargo" class="col-form-label">{{ __('Cargo*') }}</label>
-                <select id="cargo" name="cargo" class="form-control @error('cargo') is-invalid @enderror" onchange="mudar()">
-                    <option value="" disabled selected hidden>-- Cargo --</option>
-                    <option @if(old('cargo')=='Professor' ) selected @endif value="Professor">Professor</option>
-                    <option @if(old('cargo')=='Técnico' ) selected @endif value="Técnico">Técnico</option>
-                    <option @if(old('cargo')=='Outro' ) selected @endif value="Outro">Outro</option>
-                </select>
-
-                @error('cargo')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-
-            <div class="col-md-4">
-                <label for="vinculo" class="col-form-label">{{ __('Vínculo*') }}</label>
-                <select name="vinculo" id="vinculo" class="form-control @error('vinculo') is-invalid @enderror" onchange="mudar()">
-                    <option value="" disabled selected hidden>-- Vínculo --</option>
-                    <option @if(old('vinculo')=='Servidor na ativa' ) selected @endif value="Servidor na ativa">Servidor na ativa</option>
-                    <option @if(old('vinculo')=='Servidor aposentado' ) selected @endif value="Servidor aposentado">Servidor aposentado</option>
-                    <option @if(old('vinculo')=='Professor visitante' ) selected @endif value="Professor visitante">Professor visitante</option>
-                    <option @if(old('vinculo')=='Pós-doutorando' ) selected @endif value="Pós-doutorando">Pós-doutorando</option>
-                    <option @if(old('vinculo')=='Outro' ) selected @endif value="Outro">Outro</option>
-                </select>
-
-                @error('vinculo')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-
-            <div class="col-md-4" style="display: block;" id="divOutro">
-                <label for="outro" class="col-form-label">{{ __('Qual?*') }}</label>
-                <input id="outro" type="text" class="form-control @error('outro') is-invalid @enderror" name="outro" value="{{ old('outro') }}">
-
-                @error('outro')
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $message }}</strong>
-                </span>
-                @enderror
-            </div>
-        </div>
-
-        <div id="proponente" style="display: block;">
-            <div class="form-group row">
-                <div class="col-md-4">
-                    <label for="titulacaoMaxima" class="col-form-label">{{ __('Titulação Máxima*') }}</label>
-                    <select id="titulacaoMaxima" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" value="{{ old('titulacaoMaxima') }}" autocomplete="nome">
-                        <option value="" disabled selected hidden>-- Titulação --</option>
-                        <option @if(old('titulacaoMaxima')=='Doutorado' ) selected @endif value="Doutorado">Doutorado</option>
-                        <option @if(old('titulacaoMaxima')=='Mestrado' ) selected @endif value="Mestrado">Mestrado</option>
-                        <option @if(old('titulacaoMaxima')=='Especialização' ) selected @endif value="Especialização">Especialização</option>
-                        <option @if(old('titulacaoMaxima')=='Graduação' ) selected @endif value="Graduação">Graduação</option>
-                        <option @if(old('titulacaoMaxima')=='Técnico' ) selected @endif value="Técnico">Técnico</option>
-                    </select>
-
-                    @error('titulacaoMaxima')
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $message }}</strong>
-                    </span>
-                    @enderror
-                </div>
-
-                <div class="col-md-4">
-                    <label for="anoTitulacao" class="col-form-label">{{ __('Ano da Titulação*') }}</label>
-                    <input id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" value="{{ old('anoTitulacao') }}" autocomplete="nome">
-
-                    @error('anoTitulacao')
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $message }}</strong>
-                    </span>
-                    @enderror
-                </div>
-                <div class="col-md-4">
-                    <label for="areaFormacao" class="col-form-label">{{ __('Área de Formação*') }}</label>
-                    <input id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" value="{{ old('areaFormacao') }}" autocomplete="nome">
-
-                    @error('areaFormacao')
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $message }}</strong>
-                    </span>
-                    @enderror
-                </div>
-            </div>
-
-            <div class="form-group row">
-
-                <div class="col-md-4">
-                    <label for="SIAPE" class="col-form-label">{{ __('SIAPE') }}</label>
-                    <input id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" value="{{ old('SIAPE') }}" autocomplete="nome">
-
-                    @error('SIAPE')
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $message }}</strong>
-                    </span>
-                    @enderror
-                </div>
-
-                <div class="col-md-4">
-                    <label for="linkLattes" class="col-form-label">{{ __('Link do currículo Lattes*') }}</label>
-                    <input id="linkLattes" type="text" class="form-control @error('linkLattes') is-invalid @enderror" name="linkLattes" value="{{ old('linkLattes') }}" autocomplete="nome">
-
-                    @error('linkLattes')
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $message }}</strong>
-                    </span>
-                    @enderror
-                </div>
-
-                <div class="col-md-3">
-                    <label for="bolsistaProdutividade" class="col-form-label">{{ __('Bolsista de Produtividade*') }}</label><br>
-                    <select name="bolsistaProdutividade" id="bolsistaProdutividade" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" onchange="mudarNivel()">
-                        <option value="" disabled selected hidden>-- Bolsista --</option>
-                        <option @if(old('bolsistaProdutividade')=='nao' ) selected @endif value="nao">Não</option>
-                        <option @if(old('bolsistaProdutividade')=='sim' ) selected @endif value="sim">Sim</option>
-                    </select>
-                    @error('bolsistaProdutividade')
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $message }}</strong>
-                    </span>
-                    @enderror
-                </div>
-
-                <div class="col-md-1" id="nivelInput" style="display: block;">
-                    <label for="nivel" class="col-form-label">{{ __('Nível*') }}</label>
-                    <select name="nivel" id="nivel" class="form-control @error('nivel') is-invalid @enderror">
-                        <option value="" disabled selected hidden></option>                     
-                        <option value="1A">1A</option>
-                        <option value="1B">1B</option>
-                        <option value="1C">1C</option>
-                        <option value="1D">1D</option>
-                        <option value="2">2</option>
-                    </select>
-                    @error('nivel')
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $message }}</strong>
-                    </span>
-                    @enderror
+        <div class="row justify-content-center">
+            <div class="col-md-8" style="margin-bottom:20px">
+                <div class="card shadow bg-white" style="border-radius:12px; border-width:0px;">
+                    <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                        <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                            <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Cadastro</h5>
+                            <h6 class="card-title mb-0" style="color:red">* Campos obrigatórios</h6>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <div class="form-row">
+                            <div class="col-md-12">
+                                <div class="d-flex justify-content-between align-items-center" style="margin-bottom:6px">
+                                    <h5 class="card-title mb-0" style="font-size:20px; font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif; ">Informações pessoais</h5>
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="form-group">
+                                    <label for="name" class="col-form-label">{{ __('Nome Completo') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="name" type="text" class="form-control @error('name') is-invalid @enderror" name="name" placeholder="Digite seu nome completo" value="{{ old('name') }}" required autocomplete="name" autofocus>
+                    
+                                    @error('name')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="cpf" class="col-form-label">{{ __('CPF') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="cpf" type="text" class="form-control @error('cpf') is-invalid @enderror" name="cpf" placeholder="Digite o número do cpf" value="{{ old('cpf') }}" required autocomplete="cpf" autofocus>
+
+                                    @error('cpf')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="celular" class="col-form-label">{{ __('Celular') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="celular" type="text" class="form-control @error('celular') is-invalid @enderror" name="celular" placeholder="Digite o número do seu celular" value="{{ old('celular') }}" required autocomplete="celular" autofocus>
+
+                                    @error('celular')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="d-flex justify-content-between align-items-center" style="margin-bottom:6px">
+                                    <h5 class="card-title mb-0" style="font-size:20px; font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif; ">Instituição</h5>
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="form-group">
+                                    <label for="instituicaoSelect" class="col-form-label">{{ __('Instituição de Vínculo') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <select style="display: inline" onchange="showInstituicao()" class="form-control @error('instituicaoSelect') is-invalid @enderror" name="instituicaoSelect" id="instituicaoSelect">
+                                        <option value="" disabled selected hidden>-- Instituição --</option>
+                                        <option @if(old('instituicaoSelect')=='UFAPE' ) selected @endif value="UFAPE">Universidade Federal do Agreste de Pernambuco - UFAPE</option>
+                                        <option @if(old('instituicaoSelect')=='Outra' ) selected @endif value="Outra" >Outra</option>
+                                    </select>
+                                    @error('instituicaoSelect')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-12" id="displayOutro" style='display:none'>
+                                <div class="form-group">
+                                    <label for="instituicao" class="col-form-label">{{ __('Digite a Instituição') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="instituicao" type="text" class="form-control @error('instituicao') is-invalid @enderror" name="instituicao" value="{{ old('instituicao') }}" placeholder="Digite o nome da Instituição" autocomplete="instituicao" autofocus>
+                                    @error('instituicao')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="cargo" class="col-form-label">{{ __('Cargo') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <select id="cargo" name="cargo" class="form-control @error('cargo') is-invalid @enderror" onchange="mudar()">
+                                        <option value="" disabled selected hidden>-- Cargo --</option>
+                                        <option @if(old('cargo')=='Professor' ) selected @endif value="Professor">Professor</option>
+                                        <option @if(old('cargo')=='Técnico' ) selected @endif value="Técnico">Técnico</option>
+                                        <option @if(old('cargo')=='Outro' ) selected @endif value="Outro">Outro</option>
+                                    </select>
+
+                                    @error('cargo')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="vinculo" class="col-form-label">{{ __('Vínculo') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <select name="vinculo" id="vinculo" class="form-control @error('vinculo') is-invalid @enderror" onchange="mudar()">
+                                        <option value="" disabled selected hidden>-- Vínculo --</option>
+                                        <option @if(old('vinculo')=='Servidor na ativa' ) selected @endif value="Servidor na ativa">Servidor na ativa</option>
+                                        <option @if(old('vinculo')=='Servidor aposentado' ) selected @endif value="Servidor aposentado">Servidor aposentado</option>
+                                        <option @if(old('vinculo')=='Professor visitante' ) selected @endif value="Professor visitante">Professor visitante</option>
+                                        <option @if(old('vinculo')=='Pós-doutorando' ) selected @endif value="Pós-doutorando">Pós-doutorando</option>
+                                        <option @if(old('vinculo')=='Outro' ) selected @endif value="Outro">Outro</option>
+                                    </select>
+
+                                    @error('vinculo')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="form-group" style="display: block;" id="divOutro">
+                                    <label for="outro" class="col-form-label">{{ __('Qual?') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="outro" type="text" class="form-control @error('outro') is-invalid @enderror" name="outro" placeholder="Digite aqui o seu vínculo" value="{{ old('outro') }}">
+                    
+                                    @error('outro')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-12" id="proponente" style="display: block;">
+                                <div class="form-row">
+                                    <div class="col-md-6">
+                                        <div class="form-group">
+                                            <label for="titulacaoMaxima" class="col-form-label">{{ __('Titulação Máxima') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                            <select id="titulacaoMaxima" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" value="{{ old('titulacaoMaxima') }}" autocomplete="nome">
+                                                <option value="" disabled selected hidden>-- Titulação --</option>
+                                                <option @if(old('titulacaoMaxima')=='Doutorado' ) selected @endif value="Doutorado">Doutorado</option>
+                                                <option @if(old('titulacaoMaxima')=='Mestrado' ) selected @endif value="Mestrado">Mestrado</option>
+                                                <option @if(old('titulacaoMaxima')=='Especialização' ) selected @endif value="Especialização">Especialização</option>
+                                                <option @if(old('titulacaoMaxima')=='Graduação' ) selected @endif value="Graduação">Graduação</option>
+                                                <option @if(old('titulacaoMaxima')=='Técnico' ) selected @endif value="Técnico">Técnico</option>
+                                            </select>
+
+                                            @error('titulacaoMaxima')
+                                            <span class="invalid-feedback" role="alert">
+                                                <strong>{{ $message }}</strong>
+                                            </span>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="form-group">
+                                            <label for="anoTitulacao" class="col-form-label">{{ __('Ano da Titulação') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                            <input id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" placeholder="Digite o ano de titulação" value="{{ old('anoTitulacao') }}" autocomplete="nome">
+
+                                            @error('anoTitulacao')
+                                            <span class="invalid-feedback" role="alert">
+                                                <strong>{{ $message }}</strong>
+                                            </span>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="form-group">
+                                            <label for="areaFormacao" class="col-form-label">{{ __('Área de Formação') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                            <input id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" placeholder="Digite a sua área de formação" value="{{ old('areaFormacao') }}" autocomplete="nome">
+
+                                            @error('areaFormacao')
+                                            <span class="invalid-feedback" role="alert">
+                                                <strong>{{ $message }}</strong>
+                                            </span>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="form-group">
+                                            <label for="SIAPE" class="col-form-label">{{ __('SIAPE') }}</label>
+                                            <input id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" placeholder="Digite o SIAPE" value="{{ old('SIAPE') }}" autocomplete="nome">
+
+                                            @error('SIAPE')
+                                            <span class="invalid-feedback" role="alert">
+                                                <strong>{{ $message }}</strong>
+                                            </span>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12">
+                                        <div class="form-group">
+                                            <label for="linkLattes" class="col-form-label">{{ __('Link do currículo Lattes') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                            <input id="linkLattes" type="text" class="form-control @error('linkLattes') is-invalid @enderror" name="linkLattes" placeholder="Digite o link do currículo Lattes" value="{{ old('linkLattes') }}" autocomplete="nome">
+
+                                            @error('linkLattes')
+                                            <span class="invalid-feedback" role="alert">
+                                                <strong>{{ $message }}</strong>
+                                            </span>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="form-group">
+                                            <label for="bolsistaProdutividade" class="col-form-label">{{ __('Bolsista de Produtividade') }} <span style="color: red; font-weight:bold;">*</span></label><br>
+                                            <select name="bolsistaProdutividade" id="bolsistaProdutividade" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" onchange="mudarNivel()">
+                                                <option value="" disabled selected hidden>-- Bolsista --</option>
+                                                <option @if(old('bolsistaProdutividade')=='nao' ) selected @endif value="nao">Não</option>
+                                                <option @if(old('bolsistaProdutividade')=='sim' ) selected @endif value="sim">Sim</option>
+                                            </select>
+                                            @error('bolsistaProdutividade')
+                                            <span class="invalid-feedback" role="alert">
+                                                <strong>{{ $message }}</strong>
+                                            </span>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="form-group" id="nivelInput" style="display: block;">
+                                            <label for="nivel" class="col-form-label">{{ __('Nível') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                            <select name="nivel" id="nivel" class="form-control @error('nivel') is-invalid @enderror">
+                                                <option value="" disabled selected hidden></option>                     
+                                                <option value="1A">1A</option>
+                                                <option value="1B">1B</option>
+                                                <option value="1C">1C</option>
+                                                <option value="1D">1D</option>
+                                                <option value="2">2</option>
+                                            </select>
+                                            @error('nivel')
+                                            <span class="invalid-feedback" role="alert">
+                                                <strong>{{ $message }}</strong>
+                                            </span>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                    
+                                </div>
+                            </div> <!-- -->
+                            <div class="col-md-12">
+                                <div class="d-flex justify-content-between align-items-center" style="margin-bottom:6px">
+                                    <h5 class="card-title mb-0" style="font-size:20px; font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif; ">Acesso ao sistema</h5>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="email" class="col-form-label">{{ __('E-Mail') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" placeholder="Digite o seu e-mail" value="{{ old('email') }}" required autocomplete="email">
+
+                                    @error('email')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="password" class="col-form-label">{{ __('Senha') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" placeholder="Digite sua senha" required autocomplete="new-password">
+
+                                    @error('password')
+                                    <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="password-confirm" class="col-form-label">{{ __('Confirme a Senha') }} <span style="color: red; font-weight:bold;">*</span></label>
+                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="Confirme sua senha" required autocomplete="new-password">
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="form-group" id="nivelInput" style="display: block; text-align:right">
+                                    <hr>
+                                    <button type="submit" class="btn btn-success botao-form" style="">
+                                        {{ __('Finalizar Cadastro') }}
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-
-        <div class="row justify-content-center" style="margin: 20px 0 20px 0">
-
-            <div class="col-md-6" style="padding-left:0">
-                <a class="btn btn-secondary botao-form" href="/" style="width:100%">Cancelar Cadastro</a>
-            </div>
-            <div class="col-md-6" style="padding-right:0">
-                <button type="submit" class="btn btn-primary botao-form" style="width:100%">
-                    {{ __('Finalizar Cadastro') }}
-                </button>
-            </div>
-        </div>
     </form>
-
 </div>
 @endsection
 
@@ -296,6 +317,7 @@
         if (comboBoxCargo.value === "Estudante" && comboBoxVinculo.value !== "Pós-doutorando") {
             divProponente.style.display = "none";
         } else {
+            document.getElementById("outro").value="";
             divProponente.style.display = "block";
         }
 
@@ -329,11 +351,11 @@
         var instituicaoSelect = document.getElementById('instituicaoSelect');
 
         if(instituicaoSelect.value === "Outra"){        
-            instituicaoSelect.parentElement.className = 'col-md-2';
+            document.getElementById("displayOutro").style.display = "block";
             instituicao.parentElement.style.display = '';
+            document.getElementById('instituicao').value="";
         }else if(instituicaoSelect.value === "UFAPE"){
-            instituicaoSelect.parentElement.className = 'col-md-8';
-            instituicao.parentElement.style.display = 'none';
+            document.getElementById("displayOutro").style.display = "none";
         }
     }
 
diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php
index 8f1111a8060f8477d11e20f4b5112dd533fda362..c7a488cbf773111efa3a6b36297926b3a0ddf65f 100644
--- a/resources/views/auth/verify.blade.php
+++ b/resources/views/auth/verify.blade.php
@@ -1,11 +1,15 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container content">
+<div class="container content"  style="margin-top: 3rem">
     <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Verifique o seu endereço de e-mail') }}</div>
+        <div class="col-md-7">
+            <div class="card shadow-sm shadow bg-white"  style="border-radius:12px; border-width:0px;">
+                <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                    <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                        <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Verifique o seu endereço de e-mail</h5>
+                    </div>
+                </div>
 
                 <div class="card-body">
                     @if (session('resent'))
diff --git a/resources/views/coordenador/home.blade.php b/resources/views/coordenador/home.blade.php
index 174218dfab76b99d769283c656d9f21ece3b8aaf..3e72d46d93fe2184e1a5a55a3be6ae90e75fe029 100644
--- a/resources/views/coordenador/home.blade.php
+++ b/resources/views/coordenador/home.blade.php
@@ -5,97 +5,151 @@
 <div class="container">
 
     {{-- titulo da página --}}
-    <div class="row justify-content-center titulo">
-        <div class="col-sm-12">
-            <div class="row">
-
-                <h3>Editais</h3>
-
-            </div>
+    <div class="row justify-content-center" style="margin-top: 3rem; text-align:center">
+        <div class="col-md-12" style="margin-bottom: -0.5rem">
+            @if(count($eventos)>0)
+                <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Editais</h5>
+            @else
+                <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Edital</h5>
+            @endif
+        </div>
+        <div class="col-md-12">
+            <hr>
         </div>
     </div>
     @php
         $hoje = now();
     @endphp
-    <div class="row">
+    <div class="row justify-content-center">
 
+        @if(count($eventos)>0)
+            @foreach ($eventos as $evento)
 
-        @foreach ($eventos as $evento)
-            <div class="card" style="width: 18rem;">
-                @if(isset($evento->fotoEvento))
-                  <img src="{{asset('storage/eventos/'.$evento->id.'/logo.png')}}" class="card-img-top" alt="...">
-                @else
-                  <img src="{{asset('img/colorscheme.png')}}" class="card-img-top" alt="...">
-                @endif
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-sm-12">
-                            <h4 class="card-title">
-                                <div class="row justify-content-center">
-                                    <div class="col-sm-12">
-                                        {{$evento->nome}}
-                                        {{-- @if(Auth::user()->tipo == "administrador" || Auth::user()->tipo == "administradorResponsavel") --}}
-                                        @can('isCoordenador', $evento)
-                                            <div class="btn-group dropright dropdown-options">
-                                                <a id="options" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                     <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
-                                                </a>
-                                                <div class="dropdown-menu">
-                                                    <a href="{{ route('coord.detalhesEvento', ['eventoId' => $evento->id]) }}" class="dropdown-item">
-                                                        <img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt="">
-                                                        Detalhes
-                                                    </a>
-                                                    <a href="{{route('evento.editar',$evento->id)}}" class="dropdown-item">
-                                                        <img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
-                                                        Editar
+            @if (Auth::check())
+            <a href="{{  route('evento.visualizar',['id'=> $evento->id])  }}" style="text-decoration: none">
+            @else 
+            <a href="{{  route('evento.visualizarNaoLogado', ['id'=>$evento->id])  }}" style="text-decoration: none">
+            @endif
+                <div class="card" style="width: 18rem; border-radius:12px; border-width:0px; margin:10px">
+                    @if(isset($evento->fotoEvento))
+                    <img src="{{asset('storage/eventos/'.$evento->id.'/logo.png')}}" class="card-img-top" alt="...">
+                    @else
+                    <img src="{{asset('img/img_fundo.png')}}" class="card-img-top" alt="..." style="border-radius: 12px;">
+                    @endif
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <h4 class="card-title">
+                                    <div class="row justify-content-center">
+                                        <div class="col-sm-12">
+                                            <h3 style="color: #01487E; font-family:Arial, Helvetica, sans-serif; font-size:30px; font-weight:bold">{{$evento->nome}}</h3>
+                                            {{-- @if(Auth::user()->tipo == "administrador" || Auth::user()->tipo == "administradorResponsavel") --}}
+                                            @can('isCoordenador', $evento)
+                                                <div class="btn-group dropright dropdown-options">
+                                                    <a id="options" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
                                                     </a>
-                                                    <form method="POST" action="{{route('evento.deletar',$evento->id)}}">
-                                                        {{ csrf_field() }}
-                                                        {{ method_field('DELETE') }}
-                                                        <button type="submit" class="dropdown-item">
-                                                            <img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
-                                                            Deletar
-                                                        </button>
+                                                    <div class="dropdown-menu">
+                                                        <a href="{{ route('coord.detalhesEvento', ['eventoId' => $evento->id]) }}" class="dropdown-item">
+                                                            <img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt="">
+                                                            Detalhes
+                                                        </a>
+                                                        <a href="{{route('evento.editar',$evento->id)}}" class="dropdown-item">
+                                                            <img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
+                                                            Editar
+                                                        </a>
+                                                        <form method="POST" action="{{route('evento.deletar',$evento->id)}}">
+                                                            {{ csrf_field() }}
+                                                            {{ method_field('DELETE') }}
+                                                            <button type="submit" class="dropdown-item">
+                                                                <img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
+                                                                Deletar
+                                                            </button>
 
-                                                    </form>
+                                                        </form>
+                                                    </div>
                                                 </div>
-                                            </div>
-                                        @endcan
-                                       {{--  @endif --}}
-                                    </div>
+                                            @endcan
+                                        {{--  @endif --}}
+                                        </div>
 
-                                </div>
+                                    </div>
 
-                            </h4>
+                                </h4>
 
+                            </div>
                         </div>
-                    </div>
-                    <p class="card-text">
-                        <strong>Submissão:</strong> {{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}<br>
-                        <strong>Revisão:</strong> {{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}<br>
-                        <strong>Resultado Preliminar:</strong> {{date('d/m/Y',strtotime($evento->resultado_preliminar))}}<br>
-                        <strong>Recurso:</strong> {{date('d/m/Y',strtotime($evento->inicio_recurso))}} - {{date('d/m/Y',strtotime($evento->fim_recurso))}}<br>
-                        <strong>Resultado Final:</strong> {{date('d/m/Y',strtotime($evento->resultado_final))}}<br>
-                    </p>
+                        <div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
+                            <div><img src="{{asset('img/icons/icon_submissao.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
+                            <div class="form-group" style="text-align: left">
+                                <div  style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Submissão</div>
+                                <div style="color: #909090">{{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}</div>
+                            </div>
+                        </div>
+                        <div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
+                            <div><img src="{{asset('img/icons/icon_revisao.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
+                            <div class="form-group" style="text-align: left">
+                                <div  style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Revisão</div>
+                                <div style="color: #909090">{{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}</div>
+                            </div>
+                        </div>
+                        <div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
+                            <div><img src="{{asset('img/icons/icon_resultado_preliminar.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
+                            <div class="form-group" style="text-align: left">
+                                <div  style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Resultado preliminar</div>
+                                <div style="color: #909090">{{date('d/m/Y',strtotime($evento->resultado_preliminar))}}</div>
+                            </div>
+                        </div>
+                        <div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
+                            <div><img src="{{asset('img/icons/icon_recurso.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
+                            <div class="form-group" style="text-align: left">
+                                <div  style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Recurso</div>
+                                <div style="color: #909090">{{date('d/m/Y',strtotime($evento->inicio_recurso))}} - {{date('d/m/Y',strtotime($evento->fim_recurso))}}</div>
+                            </div>
+                        </div>
+                        <div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px; margin-bottom:-0.8rem">
+                            <div><img src="{{asset('img/icons/icon_resultado_final.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
+                            <div class="form-group" style="text-align: left">
+                                <div  style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Resultado final</div>
+                                <div style="color: #909090">{{date('d/m/Y',strtotime($evento->resultado_final))}}</div>
+                            </div>
+                        </div>
+                        <!--<p class="card-text">
+                            
+                            <strong>Submissão:</strong> {{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}<br>
+                            <strong>Revisão:</strong> {{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}<br>
+                            <strong>Resultado Preliminar:</strong> {{date('d/m/Y',strtotime($evento->resultado_preliminar))}}<br>
+                            <strong>Recurso:</strong> {{date('d/m/Y',strtotime($evento->inicio_recurso))}} - {{date('d/m/Y',strtotime($evento->fim_recurso))}}<br>
+                            <strong>Resultado Final:</strong> {{date('d/m/Y',strtotime($evento->resultado_final))}}<br>
+                        </p>-->
 
-                    <p>
-                        @if (Auth::check())
-                            <a href="{{  route('evento.visualizar',['id'=> $evento->id])  }}" class="visualizarEvento">Visualizar edital</a>
-                            @if($evento->inicioSubmissao <= $hoje && $hoje <= $evento->fimSubmissao)
-                              @if(Auth::user()->proponentes == null)
-                                <br><a href="{{ route('proponente.create' )}}" class="visualizarEvento">Criar projeto</a>
-                              @else
-                                  <br><a href="{{ route('trabalho.index', ['id' => $evento->id] )}}" class="visualizarEvento">Criar projeto</a>
-                              @endif
+                        <!--<p>
+                            @if (Auth::check())
+                                <a href="{{  route('evento.visualizar',['id'=> $evento->id])  }}" class="visualizarEvento">Visualizar edital</a>
+                                @if($evento->inicioSubmissao <= $hoje && $hoje <= $evento->fimSubmissao)
+                                @if(Auth::user()->proponentes == null)
+                                    <br><a href="{{ route('proponente.create' )}}" class="visualizarEvento">Criar projeto</a>
+                                @else
+                                    <br><a href="{{ route('trabalho.index', ['id' => $evento->id] )}}" class="visualizarEvento">Criar projeto</a>
+                                @endif
+                                @endif
+                            @else
+                                <a href="{{  route('evento.visualizarNaoLogado', ['id'=>$evento->id])  }}" class="visualizarEvento">Visualizar edital</a>
                             @endif
-                        @else
-                            <a href="{{  route('evento.visualizarNaoLogado', ['id'=>$evento->id])  }}" class="visualizarEvento">Visualizar edital</a>
-                        @endif
-                    </p>
-                </div>
+                        </p> -->
+                    </div>
 
+                </div>
+            </a>
+            @endforeach
+        @else
+            <div class="form-row justify-content-lg-center" style="width:100%; margin-top:4rem; text-align:center">
+                <div class="col-md-12">
+                    <img src="{{asset('img/icons/logo_projeto.png')}}"  alt="..." width="190px">
+                </div>
+                <div class="col-md-5" style="text-align: center;margin-top:1rem"><h5>Nenhum edital cadastrado!</h5></div>
             </div>
-        @endforeach
+        @endif
     </div>
 
 </div>
diff --git a/resources/views/evento/submeterTrabalho.blade.php b/resources/views/evento/submeterTrabalho.blade.php
index b1db804f7211299640b6f13f07f26880e1514d8d..ce1277c15afae63d2ed5607c703bb2ab30862d3b 100644
--- a/resources/views/evento/submeterTrabalho.blade.php
+++ b/resources/views/evento/submeterTrabalho.blade.php
@@ -575,14 +575,14 @@
                               <label for="ordemDePrioridade1">{{ __('Ordem de prioridade') }}  <span style="color: red; font-weight:bold">*</span></label>
                                     <select name="ordem_prioridade[]" id="ordemDePrioridade1" class="form-control" >
                                       <option value="" disabled selected>-- ORDEM --</option>
-                                      <option value="1">1º</option>
-                                      <option value="2">2º</option>
-                                      <option value="3">3º</option>
+                                      <option value="1">1</option>
+                                      <option value="2">2</option>
+                                      <option value="3">3</option>
                                     </select>
                             </div>
                             <div class="form-group col-md-6">
                               <label for="coeficienteDeRendimento1">Coeficiente de rendimento <span style="color: red; font-weight:bold">*</span></label>
-                              <input type="number" class="form-control media" id="coeficienteDeRendimento1" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
+                              <input type="number" class="form-control media" id="coeficienteDeRendimento1" min="0" max="10" step="0.01" name="media_geral_curso[]" required>
                               @error('coeficienteDeRendimento1')
                               <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
                                 <strong>{{ $message }}</strong>
@@ -827,14 +827,14 @@
                             <label for="ordemDePrioridade2">{{ __('Ordem de prioridade') }}  <span style="color: red; font-weight:bold">*</span></label>
                                   <select name="ordem_prioridade[]" id="ordemDePrioridade2" class="form-control" required>
                                     <option value="" disabled selected>-- ORDEM --</option>
-                                    <option value="1">1º</option>
-                                    <option value="2">2º</option>
-                                    <option value="3">3º</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
                                   </select>
                           </div>
                           <div class="form-group col-md-6">
                             <label for="coeficienteDeRendimento2">Coeficiente de rendimento <span style="color: red; font-weight:bold">*</span></label>
-                            <input type="number" class="form-control media" id="coeficienteDeRendimento2" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
+                            <input type="number" class="form-control media" id="coeficienteDeRendimento2" min="0" max="10" step="0.01" name="media_geral_curso[]" required>
                             @error('coeficienteDeRendimento2')
                             <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
                               <strong>{{ $message }}</strong>
@@ -1079,14 +1079,14 @@
                               <label for="ordemDePrioridade3">{{ __('Ordem de prioridade') }}  <span style="color: red; font-weight:bold">*</span></label>
                                     <select name="ordem_prioridade[]" id="ordemDePrioridade3" class="form-control" required>
                                       <option value="" disabled selected>-- ORDEM --</option>
-                                      <option value="1">1º</option>
-                                      <option value="2">2º</option>
-                                      <option value="3">3º</option>
+                                      <option value="1">1</option>
+                                      <option value="2">2</option>
+                                      <option value="3">3</option>
                                     </select>
                             </div>
                             <div class="form-group col-md-6">
                               <label for="coeficienteDeRendimento3">Coeficiente de rendimento <span style="color: red; font-weight:bold">*</span></label>
-                              <input type="number" class="form-control media" id="coeficienteDeRendimento3" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
+                              <input type="number" class="form-control media" id="coeficienteDeRendimento3" min="0" max="10" step="0.01" name="media_geral_curso[]" required>
                               @error('coeficienteDeRendimento3')
                               <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
                                 <strong>{{ $message }}</strong>
diff --git a/resources/views/evento/visualizarEvento.blade.php b/resources/views/evento/visualizarEvento.blade.php
index 9e52a2dc07fa80fb2b960fbb768832ce94ad5182..c61006f5a07acb0441293bf42a3635d5bb356770 100644
--- a/resources/views/evento/visualizarEvento.blade.php
+++ b/resources/views/evento/visualizarEvento.blade.php
@@ -3,296 +3,261 @@
 @section('content')
 
 
-<div class="modal fade" id="modalTrabalho" tabindex="-1" role="dialog" aria-labelledby="modalTrabalho" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalCenterTitle">Submeter nova versão</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form method="POST" action="{{route('trabalho.novaVersao')}}" enctype="multipart/form-data">
-        @csrf
-      <div class="modal-body">
-
-        <div class="row justify-content-center">
-          <div class="col-sm-12">
-              @if($hasFile)
-                <input type="hidden" name="trabalhoId" value="" id="trabalhoNovaVersaoId">
-              @endif
-              <input type="hidden" name="eventoId" value="{{$evento->id}}">
-
-              {{-- Arquivo  --}}
-              <label for="nomeTrabalho" class="col-form-label">{{ __('Arquivo') }}</label>
-
-              <div class="custom-file">
-                <input type="file" class="filestyle" data-placeholder="Nenhum arquivo" data-text="Selecionar" data-btnClass="btn-primary-lmts" name="arquivo">
-              </div>
-              <small>O arquivo Selecionado deve ser no formato PDF de até 2mb.</small>
-              @error('arquivo')
-              <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
-                <strong>{{ $message }}</strong>
-              </span>
-              @enderror
+<div class="container" style="margin-top: 2rem">
+  <div class="row justify-content-center">
+      <div class="container" style="margin-bottom: 1rem;">
+        @if(!Auth::check())
+          <div class="alert alert-warning alert-dismissible fade show" role="alert">
+            <strong> A submissão de um projeto é possível apenas quando cadastrado no sistema. </strong>
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
           </div>
-        </div>
-
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Fechar</button>
-        <button type="submit" class="btn btn-primary">Salvar</button>
-      </div>
-    </form>
-    </div>
-  </div>
-</div>
-
-
-
-
-
-
-
-
-
-<div class="container-fluid content">
-    <div class="row">
-        @if(isset($evento->fotoEvento))
-          <img class="front-image-evento" src="{{asset('storage/eventos/'.$evento->id.'/logo.png')}}" alt="">
-        @else
-          <img class="front-image-evento" src="{{asset('img/colorscheme.png')}}" alt="">
         @endif
-    </div>
-</div>
-<div class="container" style="margin-top:20px">
-    @if(!Auth::check())
-      <div class="alert alert-warning alert-dismissible fade show" role="alert">
-        <strong> A submissão de um projeto é possível apenas quando cadastrado no sistema. </strong>
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-    @endif
-    <div class="row margin">
-        <div class="col-sm-12">
-            <h1>
-                {{$evento->nome}}
-            </h1>
-        </div>
-    </div>
-
-    <div class="row margin">
-        <div class="col-sm-12">
-            <h4>Descrição</h4>
-        </div>
-    </div>
-    <div class="row margin">
-        <div class="col-sm-12">
-            <p>{{$evento->descricao}}</p>
-        </div>
-    </div>
-    <div class="row margin">
-        <div class="col-sm-12 info-evento">
-            <h4>Submissão de Projetos</h4>
-            <p>
-                <img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt="">
-                {{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}
-            </p>
-        </div>
-    </div>
-    <div class="row margin">
-        <div class="col-sm-12 info-evento">
-
-            <h4>Avaliação de Projetos</h4>
-            <p>
-                <img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt="">
-                {{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}
-            </p>
-        </div>
-    </div>
-    <div class="row margin">
-        <div class="col-sm-12 info-evento">
-
-            <h4>Resultado Preliminar</h4>
-            <p>
-                <img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt="">
-                {{date('d/m/Y',strtotime($evento->resultado_preliminar))}}
-            </p>
-
-        </div>
-    </div>
-    <div class="row margin">
-        <div class="col-sm-12 info-evento">
-
-            <h4>Início do Recurso</h4>
-            <p>
-                <img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt="">
-                {{date('d/m/Y',strtotime($evento->inicio_recurso))}}
-            </p>
-
-        </div>
-    </div>
-    <div class="row margin">
-        <div class="col-sm-12 info-evento">
-
-            <h4>Fim do Recurso</h4>
-            <p>
-                <img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt="">
-                {{date('d/m/Y',strtotime($evento->fim_recurso))}}
-            </p>
-
-        </div>
-    </div>
-    <div class="row margin">
-        <div class="col-sm-12 info-evento">
-
-            <h4>Resultado Final</h4>
-            <p>
-                <img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt="">
-                {{date('d/m/Y',strtotime($evento->resultado_final))}}
-            </p>
-
-        </div>
-    </div>
-
-    <div class="row justify-content-center">
-      <div class="col-sm-12">
-
-        <table class="table table-responsive-lg table-hover">
-          <thead>
-            <tr>
-              <th style="text-align:center">Edital</th>
-              <th style="text-align:center">Modelos</th>
-            </tr>
-          </thead>
-          <tbody>
-              <tr>
-                <td style="text-align:center">
-                  <a href="{{route('baixar.edital', ['id' => $evento->id])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
-                    <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
-                  </a>
-                </td>
-                <td style="text-align:center">
-                  @if($evento->modeloDocumento != null)
-                    <a href="{{route('baixar.modelos', ['id' => $evento->id])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
-                      <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
-                    </a>
-                  @else
-                    O criador do edital não disponibilizou modelos
-                  @endif
-                </td>
-              </tr>
-          </tbody>
-        </table>
       </div>
-    </div>
+      <div class="col-md-7" style="margin-bottom:10px">
 
-    @if($hasFile == true)
-      <div class="row margin">
-          <div class="col-sm-12">
-              <h1>
-                  Meus Projetos
-              </h1>
+        <div class="form-row">
+          <div class="col-md-12" style="margin-bottom:20px">
+            <div class="card shadow bg-white" style="border-radius:12px; border-width:0px;">
+              @if(isset($evento->fotoEvento))
+                <img src="{{asset('storage/eventos/'.$evento->id.'/logo.png')}}" class="card-img-top" alt="...">
+              @else
+                <img src="{{asset('img/img_fundo_2.png')}}" class="card-img-top" alt="..." style="border-radius:12px">
+              @endif
+                <div class="card-body">
+                    <div class="form-row">
+                      
+                      <div class="col-md-12" style="margin-bottom: 1.5rem">
+                        <h5 class="card-title mb-0" style="font-size:35px; font-family:Arial, Helvetica, sans-serif; color:#0842A0; font-weight:bold">{{$evento->nome}}</h5>
+                      </div>
+
+                      <div class="col-md-12" style="margin-top: 5px">
+                        <div><h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6;">Descrição</h5></div>
+                        <div style="margin-top: 10px"><h5>{{$evento->descricao}}</h5></div>
+                      </div>
+                    </div>
+                </div>
+            </div>
           </div>
-      </div>
-      @if($hasTrabalho)
-        <div class="row margin">
-            <div class="col-sm-12 info-evento">
-                <h4>Como Proponente</h4>
+          @if($hasFile == true)
+          @if($hasTrabalho)
+          <div class="col-md-12" style="margin-top:8px; margin-bottom:20px">
+            <div class="card shadow bg-white" style="border-radius:12px; border-width:0px;">
+              <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                  <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Minhas propostas</h5>
+                </div>
+              </div>
+                <div class="card-body">
+                    <div class="form-row">
+                      
+                     
+                        <div class="col-md-12">
+                          <div style=" margin-bottom:-12px">
+                                
+                            <table class="table table-bordered table-hover" style="display: block; 
+                            overflow-x: auto;
+                            white-space: nowrap; border-radius:10px">
+                                  <thead>
+                                    <tr>
+                                      <th scope="col" style="width:100%; font-weight:normal; color:#909090">Título</th>
+                                      <th scope="col" style="font-weight:normal; color:#909090; text-align:center">Baixar</th>
+                                    </tr>
+                                  </thead>
+                                  <tbody>
+                                    @foreach($trabalhos as $trabalho)
+                                      <tr>
+                                        <td style="font-size:18px">{{ $trabalho->titulo }}</td>
+                                        <td style="text-align:center">
+                                          @php $arquivo = ""; @endphp
+                                          @foreach($trabalho->arquivo as $key)
+                                            @php
+                                              if($key->versaoFinal == true){
+                                                $arquivo = $key->nome;
+                                              }
+                                            @endphp
+                                          @endforeach
+                                          <a class="btn btn-light" href="{{route('baixar.anexo.projeto', ['id' => $trabalho->id])}}" target="_new" style="" >
+                                              <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:15px"> Baixar
+                                          </a>
+                                        </td>
+                                      </tr>
+                                    @endforeach
+                                  </tbody>
+                                </table>
+                            
+                          </div>
+                        </div>
+                       
+                    </div>
+                </div>
             </div>
-        </div>
-
-        <!-- Tabela de trabalhos -->
-
-        <div class="row justify-content-center">
-          <div class="col-sm-12">
-
-            <table class="table table-responsive-lg table-hover">
-              <thead>
-                <tr>
-                  <th>Título</th>
-                  <th style="text-align:center">Baixar</th>
-                  {{-- <th style="text-align:center">Nova Versão</th> --}}
-                </tr>
-              </thead>
-              <tbody>
-                @foreach($trabalhos as $trabalho)
-                  <tr>
-                    <td>{{$trabalho->titulo}}</td>
-                    <td style="text-align:center">
-                      @php $arquivo = ""; @endphp
-                      @foreach($trabalho->arquivo as $key)
-                        @php
-                          if($key->versaoFinal == true){
-                            $arquivo = $key->nome;
-                          }
-                        @endphp
-                      @endforeach
-                      <a href="{{route('baixar.anexo.projeto', ['id' => $trabalho->id])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
-                          <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
-                      </a>
-                    </td>
-                    {{-- <td style="text-align:center">
-                      @if($evento->inicioSubmissao <= $mytime)
-                        @if($mytime < $evento->fimSubmissao)
-                          <a href="#" onclick="changeTrabalho({{$trabalho->id}})" data-toggle="modal" data-target="#modalTrabalho" style="color:#114048ff">
-                            <img class="" src="{{asset('img/icons/file-upload-solid.svg')}}" style="width:20px">
-                          </a>
-                        @endif
-                      @endif
-                    </td> --}}
-                  </tr>
-                @endforeach
-              </tbody>
-            </table>
           </div>
+          @endif
+          @endif
         </div>
-      @endif
+      </div>
+      <div class="col-md-4">
+          <div class="form-row">
+              <div class="col-md-12" style="margin-bottom:30px">
+                  <div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
+                      <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                          <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                              <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Ações</h5>
+                            </div>
+                      </div>
+                      <div class="card-body">
+                        <div class="form-row">
+                          
+                          @if($evento->inicioSubmissao <= $mytime)
+                            @if($mytime < $evento->fimSubmissao)
+                            <div class="col-md-12" style="margin-bottom:18px">
+                              <a class="btn btn-success " href="{{route('trabalho.index',['id'=>$evento->id])}}" style="width:100%; height:50px; padding-top:7px; font-size:20px"><img src="{{asset('img/icons/icon_enviar_proposta.png')}}" class="card-img-top" alt="..." style="width:30px; margin-right:5px"> Submeter proposta</a>
+                            </div>
+                            <div class="col-md-12">
+                              <a class="btn btn-primary" href="{{ route('proponente.projetosEdital', ['id' => $evento->id]) }}" style="width:100%; height:50px; padding-top:5px; font-size:20px"><img src="{{asset('img/icons/icon_minhas_propostas.png')}}" class="card-img-top" alt="..." style="width:20px; margin-right:10px; margin-top:-5px"> Minhas propostas</a>
+                            </div>
+                            @endif
+                          @endif
+                          
+                        </div>
+                      </div>
+                  </div>
+              </div>
+              <div class="col-md-12" style="margin-bottom:30px">
+                  <div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
+                      <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                          <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                            <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Datas importantes</h5>
+                          </div>
+                      </div>
+                      <div class="card-body">
+                        <div class="form-row">
+
+                          <div class="col-md-12">
+                            <div class="d-flex justify-content-left align-items-center">
+                              <div style="margin-right:10px; margin-top:-20px">
+                                <img class="" src="{{asset('img/icons/icon_submissao.png')}}" alt="" width="40px">
+                              </div>
+                                <div class="form-group">
+                                  <div style="margin-bottom: -8px;"><h5 style=" font-size:19px">Submissão</h5></div>
+                                  <div><h5 style="font-weight: normal; color:#909090">{{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}</h5></div>
+                                </div>
+                            </div>
+                          </div>
+
+                          <div class="col-md-12">
+                            <div class="d-flex justify-content-left align-items-center">
+                              <div style="margin-right:10px; margin-top:-20px">
+                                <img class="" src="{{asset('img/icons/icon_revisao.png')}}" alt="" width="40px">
+                              </div>
+                                <div class="form-group">
+                                  <div style="margin-bottom: -8px;"><h5 style=" font-size:19px">Revisão</h5></div>
+                                  <div><h5 style="font-weight: normal; color:#909090">{{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}</h5></div>
+                                </div>
+                            </div>
+                          </div>
+
+                          <div class="col-md-12">
+                            <div class="d-flex justify-content-left align-items-center">
+                              <div style="margin-right:10px; margin-top:-20px">
+                                <img class="" src="{{asset('img/icons/icon_resultado_preliminar.png')}}" alt="" width="40px">
+                              </div>
+                                <div class="form-group">
+                                  <div style="margin-bottom: -8px;"><h5 style=" font-size:19px">Resultado preliminar</h5></div>
+                                  <div><h5 style="font-weight: normal; color:#909090">{{date('d/m/Y',strtotime($evento->resultado_preliminar))}}</h5></div>
+                                </div>
+                            </div>
+                          </div>
+
+                          <div class="col-md-12">
+                            <div class="d-flex justify-content-left align-items-center">
+                              <div style="margin-right:10px; margin-top:-20px">
+                                <img class="" src="{{asset('img/icons/icon_recurso.png')}}" alt="" width="40px">
+                              </div>
+                                <div class="form-group">
+                                  <div style="margin-bottom: -8px;"><h5 style=" font-size:19px">Recurso</h5></div>
+                                  <div><h5 style="font-weight: normal; color:#909090">{{date('d/m/Y',strtotime($evento->inicio_recurso))}} - {{date('d/m/Y',strtotime($evento->fim_recurso))}}</h5></div>
+                                </div>
+                            </div>
+                          </div>
+
+                          <div class="col-md-12" style="margin-bottom: -15px">
+                            <div class="d-flex justify-content-left align-items-center">
+                              <div style="margin-right:10px; margin-top:-20px">
+                                <img class="" src="{{asset('img/icons/icon_resultado_final.png')}}" alt="" width="40px">
+                              </div>
+                                <div class="form-group">
+                                  <div style="margin-bottom: -8px;"><h5 style=" font-size:19px">Resultado final</h5></div>
+                                  <div><h5 style="font-weight: normal; color:#909090">{{date('d/m/Y',strtotime($evento->resultado_final))}}</h5></div>
+                                </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                  </div>
+              </div>
+              <div class="col-md-12" style="margin-bottom:30px">
+                <div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
+                    <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                        <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                          <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Documentos</h5>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                      <div class="form-row">
+
+                        <div class="col-md-12">
+                          <div class="d-flex justify-content-left align-items-center" style="margin-bottom: -15px">
+                            <div style="margin-right:10px; margin-top:-15px">
+                              <img class="" src="{{asset('img/icons/icon_edital.png')}}" alt="" width="40px">
+                            </div>
+                            <div class="form-group" style="width: 100%">
+                              <div class="d-flex justify-content-between" style="width: 100%">
+                                <div><h5 style=" font-size:19px; margin-top:9px">Edital</h5></div>
+                                <div style="float: right"><a class="btn btn-light" href="{{route('baixar.edital', ['id' => $evento->id])}}" target="_new" style="" >
+                                  <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
+                                  Baixar</a></div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <div class="col-md-12"><hr></div>
+
+                        <div class="col-md-12">
+                          @if($evento->modeloDocumento != null)
+                          <div class="d-flex justify-content-left align-items-center" style="margin-bottom: -15px">
+                            <div style="margin-right:10px; margin-top:-15px">
+                              <img class="" src="{{asset('img/icons/icon_modelo.png')}}" alt="" width="40px">
+                            </div>
+                            <div class="form-group" style="width: 100%">
+                              <div class="d-flex justify-content-between" style="width: 100%">
+                                <div><h5 style=" font-size:19px; margin-top:9px">Modelo</h5></div>
+                                <div>
+                                    <a class="btn btn-light" href="{{route('baixar.modelos', ['id' => $evento->id])}}" target="_new" style="" >
+                                      <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
+                                    Baixar</a>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          @else
+                          <h6 style="color: #909090">O criador do edital não disponibilizou modelos</h6>
+                        @endif
+                        </div>
 
-{{--       @if($hasTrabalhoCoautor)
-        <div class="row margin">
-            <div class="col-sm-12 info-evento">
-                <h4>Como Coautor</h4>
+                      </div>
+                    </div>
+                </div>
             </div>
-        </div>
+  </div>
+</div>
 
-        <div class="row justify-content-center">
-          <div class="col-sm-12">
 
-            <table class="table table-responsive-lg table-hover">
-              <thead>
-                <tr>
-                  <th>Título</th>
-                  <th  style="text-align:center">Baixar</th>
-                </tr>
-              </thead>
-              <tbody>
-                @foreach($trabalhosCoautor as $trabalho)
-                  <tr>
-                    <td>{{$trabalho->titulo}}</td>
-                    <td style="text-align:center">
-                      @php $arquivo = ""; @endphp
-                      @foreach($trabalho->arquivo as $key)
-                        @php
-                          if($key->versaoFinal == true){
-                            $arquivo = $key->nome;
-                          }
-                        @endphp
-                      @endforeach
-                      <a href="{{route('download', ['file' => $arquivo])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
-                          <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
-                      </a>
-                    </td>
-                  </tr>
-                @endforeach
-              </tbody>
-            </table>
-          </div>
-        </div>
-      @endif --}}
-    @endif
 
+<!--
     <div class="row justify-content-center" style="margin: 20px 0 20px 0">
 
         <div class="col-md-6 botao-form-left" style="">
@@ -319,8 +284,8 @@
         @endif
 
     </div>
-</div>
 
+  -->
 
 @endsection
 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4395189becf5e03210a1fb1cc9ee9a78d0eb1365..c6cc252880d69554694480be7dd87abbd3dbdd30 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -23,6 +23,9 @@
     <link href="{{ asset('css/layout.css') }}" rel="stylesheet">
 
     <style>
+    body{
+        background-color: #f8fafc
+    }
       .styleRodape {
         background-color: rgb(0, 140, 255);;
         text-align: center;
diff --git a/resources/views/projeto/editar.blade.php b/resources/views/projeto/editar.blade.php
index 5ee3461935f3b7921803fa893660410608f61869..ce7e793fafdb534a417a0ec2d48569c353c9ecc8 100644
--- a/resources/views/projeto/editar.blade.php
+++ b/resources/views/projeto/editar.blade.php
@@ -6,14 +6,14 @@
   @csrf
   <input type="hidden" name="editalId" value="{{$edital->id}}">
 
-  <div class="container">
+  <div class="container" style="margin-top: 3rem">
     <div class="row justify-content-center">
       
       <!-- projeto -->
       {{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">1º Passo</h4></div>
       <div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do projeto</h5></div> --}}
       <div class="col-md-10">
-        <div class="card" style="border-radius: 12px">
+        <div class="card" style="border-radius: 12px; margin-bottom:2rem">
           
           <div class="card-body">
             <div class="container">
@@ -99,7 +99,7 @@
       {{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">2º Passo</h4></div>
       <div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do proponente</h5></div> --}}
       <div class="col-md-10">
-        <div class="card" style="border-radius: 12px">
+        <div class="card" style="border-radius: 12px; margin-bottom:2rem">
           <div class="card-body">
             <div class="container">
               <div class="form-row mt-3">
@@ -161,7 +161,7 @@
       {{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">3º Passo</h4></div>
       <div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Anexos</h5></div> --}}
       <div class="col-md-10">
-        <div class="card" style="border-radius: 12px">
+        <div class="card" style="border-radius: 12px; margin-bottom:2rem">
           <div class="card-body">
             <div class="container">
               <div class="form-row mt-3">
@@ -338,7 +338,7 @@
       {{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">4º Passo</h4></div>
       <div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Área do(s) participante(s)</h5></div> --}}
       <div class="col-md-10">
-        <div class="card" style="border-radius: 12px; padding:15px">
+        <div class="card" style="border-radius: 12px; padding:15px; margin-bottom:2rem">
           <div class="card-body" style="margin-bottom: -2rem">
             <div class="d-flex justify-content-between align-items-center">
               <div><h5 style="color: #1492E6; margin-top:0.5rem">Participante(s)</h5></div>
@@ -1015,7 +1015,7 @@
                             </div>
                             <div class="form-group col-md-6">
                               <label for="cidade3">Cidade <span style="color: red; font-weight:bold">*</span></label>
-                              <input type="text" class="form-control @error('cidade3') is-invalid @enderror" id="cidade3" name="cidade[]" placeholder="Digite a cidade do participante" required value="@if($resultado_participante_tres){{$participantes[2]->user->endereco->cep}}@endif">
+                              <input type="text" class="form-control @error('cidade3') is-invalid @enderror" id="cidade3" name="cidade[]" placeholder="Digite a cidade do participante" required value="@if($resultado_participante_tres){{$participantes[2]->user->endereco->cidade}}@endif">
                               @error('cidade3')
                               <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
                                 <strong>{{ $message }}</strong>
diff --git a/resources/views/projeto/visualizar.blade.php b/resources/views/projeto/visualizar.blade.php
index 9a375ee39bb246e352c0980ae09487c8d1cde12e..dae21ef575587ef76c8efb06e266d5b89cda467c 100644
--- a/resources/views/projeto/visualizar.blade.php
+++ b/resources/views/projeto/visualizar.blade.php
@@ -6,14 +6,14 @@
   @csrf --}}
   <input type="hidden" name="editalId" value="{{$edital->id}}">
 
-  <div class="container">
+  <div class="container" style="margin-top: 3rem">
     <div class="row justify-content-center">
       
       <!-- projeto -->
       {{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">1º Passo</h4></div>
       <div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do projeto</h5></div> --}}
       <div class="col-md-10">
-        <div class="card" style="border-radius: 12px">
+        <div class="card" style="border-radius: 12px; margin-bottom:2rem;">
           
           <div class="card-body">
             <div class="container">
@@ -99,7 +99,7 @@
       {{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">2º Passo</h4></div>
       <div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do proponente</h5></div> --}}
       <div class="col-md-10">
-        <div class="card" style="border-radius: 12px">
+        <div class="card" style="border-radius: 12px; margin-bottom:2rem">
           <div class="card-body">
             <div class="container">
               <div class="form-row mt-3">
@@ -161,7 +161,7 @@
       {{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">3º Passo</h4></div>
       <div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Anexos</h5></div> --}}
       <div class="col-md-10">
-        <div class="card" style="border-radius: 12px">
+        <div class="card" style="border-radius: 12px; margin-bottom:2rem">
           <div class="card-body">
             <div class="container">
               <div class="form-row mt-3">
diff --git a/resources/views/proponente/editais.blade.php b/resources/views/proponente/editais.blade.php
index 37f83fada7fafc42eca432973e8c3f0ed47f3fb0..95ece972aed71652c6b65db93ff3eec3074c6a4a 100644
--- a/resources/views/proponente/editais.blade.php
+++ b/resources/views/proponente/editais.blade.php
@@ -2,99 +2,99 @@
 
 @section('content')
 
-<div class="container" style="margin-top: 100px;">
-
-  <div class="container" >
-    <div class="row" >
-      <div class="col-sm-1" style="text-align: left; flaot:left;">
-        <a href="{{ route('proponente.index') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a>
-      </div>
-      <div class="col-sm-7" style="text-align: center;">
-        <div class="row">
-          <div class="col-md-4">
+<div class="container">
+  <div class="row justify-content-center" style="margin-top: 2rem;">
+    <div class="col-md-11">
+      <div class="card" style="border-radius: 12px; padding:14px">
+          
+        <div class="card-body" style="margin-bottom: -2rem">
+          <div class="d-flex justify-content-between align-items-center">
+            <div class="bottomVoltar">
+              <a href="{{ route('proponente.index') }}" class="btn btn-secondary" style="position:relative; float: right;"><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
+            </div>
+            <div><h5 style="color: #1492E6; margin-top:0.5rem">Editais</h5></div>
+            <div>
+              <div class="row justify-content-end">
+              <div class="btn-group col">
+                <button class="btn" onclick="buscarEdital(this.parentElement.parentElement.children[1].children[0])" style="margin-right:5px; border-radius:12px">
+                  <img src="{{asset('img/icons/logo_lupa2.png')}}" alt="" width="25px">
+                </button>
+                <input type="text" class="form-control form-control-edit" placeholder="Digite o nome do edital" onkeyup="buscarEdital(this)" style="border-color: #d1d1d1">
+              </div>
+            </div>
           </div>
-          <div class="col-md-8">
-            <h4 class="titulo-table">Editais</h4>
           </div>
+          <div  style="margin-top:-10px"><hr style="border-top: 1px solid#1492E6"></div>
         </div>
-      </div>
-      <div class="col-sm-4">
-        <div class="row">
-          <div class="col-sm-2">
-            <button class="btn" onclick="buscarEdital(this.parentElement.parentElement.children[1].children[0])">
-              <img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
-            </button>
-          </div>
-          <div class="col-sm-10">
-            <input type="text" class="form-control form-control-edit" placeholder="Digite o nome do edital" onkeyup="buscarEdital(this)">
-          </div>
+
+        <div class="card-body" >
+          <table class="table table-bordered table-hover" style="display: block; 
+          overflow-x: auto;
+          white-space: nowrap; border-radius:10px">
+            <thead>
+              <tr>
+                <th scope="col" style="width: 100%;">Edital</th>
+                <th scope="col" style="text-align: center;">Inicio da Submissão</th>
+                <th scope="col" style="text-align: center;">Fim da Submissão</th>
+                <th scope="col" style="text-align: center;">Data do Resultado</th>
+                <th scope="col" style="text-align: center;">Baixar Edital</th>
+                <th scope="col" style="text-align: center;">Opção</th>
+              </tr>
+            </thead>
+            <tbody id="eventos">
+              @foreach ($eventos as $evento)
+                <tr>
+                  <td style="text-align: left;">
+                    <a href="{{  route('evento.visualizar',['id'=>$evento->id])  }}" class="">
+                        {{ $evento->nome }}
+                    </a>
+                  </td>
+                  <td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->inicioSubmissao)) }}</td>
+                  <td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</td>
+                  <td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->created_at)) }}</td>
+                  <td style="text-align: center">
+                    <a class="btn btn-light" href="{{ route('baixar.edital', ['id' => $evento->id]) }}" style="width: 100%">
+                      <img src="{{asset('img/icons/file-download-solid.svg')}}" width="15px">
+                    </a>
+                  </td>
+                  <td>
+                    <div class="dropright dropdown-options" style="width: 100%; text-align:center; float:none">
+                      <a id="options" class="dropdown-toggle btn btn-light" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                           <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
+                      </a>
+                      <div class="dropdown-menu">
+                          <a href="{{ route('proponente.projetosEdital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center">
+                            Projetos submetidos
+                          </a>
+                          @if($evento->inicioSubmissao <= $hoje && $hoje <= $evento->fimSubmissao)
+                            <hr class="dropdown-hr">
+                            <a href="{{ route('trabalho.index', ['id' => $evento->id] )}}" class="dropdown-item" style="text-align: center">
+                              Criar projeto
+                            </a>
+                          @endif
+                          {{-- <a href="" class="dropdown-item" style="text-align: center">
+                            Visualizar resultado
+                          </a> --}}
+                          {{-- <a href="" class="dropdown-item" style="text-align: center">
+                            Recurso ao resultado
+                          </a>
+                          <a href="" class="dropdown-item" style="text-align: center">
+                            Resultado preeliminar
+                          </a>
+                          <a href="" class="dropdown-item" style="text-align: center">
+                            Resultado final
+                          </a> --}}
+                      </div>
+                    </div>
+                  </td>
+                </tr>
+              @endforeach
+            </tbody>
+          </table>
         </div>
       </div>
     </div>
   </div>
-  <hr>
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th scope="col">Edital</th>
-          <th scope="col" style="text-align: center;">Inicio da Submissão</th>
-          <th scope="col" style="text-align: center;">Fim da Submissão</th>
-          <th scope="col" style="text-align: center;">Data do Resultado</th>
-          <th scope="col" style="text-align: center;">Baixar Edital</th>
-          <th scope="col">Opção</th>
-        </tr>
-      </thead>
-      <tbody id="eventos">
-        @foreach ($eventos as $evento)
-          <tr>
-            <td>
-              <a href="{{  route('evento.visualizar',['id'=>$evento->id])  }}" class="visualizarEvento">
-                  {{ $evento->nome }}
-              </a>
-            </td>
-            <td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->inicioSubmissao)) }}</td>
-            <td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</td>
-            <td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->created_at)) }}</td>
-            <td style="text-align: center">
-              <a href="{{ route('baixar.edital', ['id' => $evento->id]) }}">
-                <img src="{{asset('img/icons/file-download-solid.svg')}}" width="15px">
-              </a>
-            </td>
-            <td>
-              <div class="btn-group dropright dropdown-options">
-                  <a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                       <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
-                  </a>
-                  <div class="dropdown-menu">
-                      <a href="{{ route('proponente.projetosEdital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center">
-                        Projetos submetidos
-                      </a>
-                      @if($evento->inicioSubmissao <= $hoje && $hoje <= $evento->fimSubmissao)
-                        <hr class="dropdown-hr">
-                        <a href="{{ route('trabalho.index', ['id' => $evento->id] )}}" class="dropdown-item" style="text-align: center">
-                          Criar projeto
-                        </a>
-                      @endif
-                      {{-- <a href="" class="dropdown-item" style="text-align: center">
-                        Visualizar resultado
-                      </a> --}}
-                      {{-- <a href="" class="dropdown-item" style="text-align: center">
-                        Recurso ao resultado
-                      </a>
-                      <a href="" class="dropdown-item" style="text-align: center">
-                        Resultado preeliminar
-                      </a>
-                      <a href="" class="dropdown-item" style="text-align: center">
-                        Resultado final
-                      </a> --}}
-                  </div>
-              </div>
-            </td>
-          </tr>
-        @endforeach
-      </tbody>
-    </table>
-
 </div>
 
 @endsection
diff --git a/resources/views/proponente/projetosEdital.blade.php b/resources/views/proponente/projetosEdital.blade.php
index a2066b4ca0fc496b1bbcf88a02d45242f986f097..75145e01ba5966017a858d38cf46e31c64116c07 100644
--- a/resources/views/proponente/projetosEdital.blade.php
+++ b/resources/views/proponente/projetosEdital.blade.php
@@ -1,120 +1,146 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container" style="margin-top: 100px;">
 
-    @if(isset($mensagem))
-    <div class="col-sm-12">
-        <br>
-        <div class="alert alert-success">
-            <p>{{ $mensagem }}</p>
-        </div>
-    </div>
-    @endif
-    @if(session('mensagem'))
-    <div class="col-sm-12">
-        <br>
-        <div class="alert alert-success">
-            <p>{{session('mensagem')}}</p>
-        </div>
-    </div>
-    @endif
-    <div class="container" >
-      <div class="row" >
-        <div class="col-sm-1">
-          <a href="{{ route('proponente.editais') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a>
-        </div>
-        <div class="col-sm-9" style="text-align: center">
-          <h4 class="titulo-table">Projetos do edital {{ $edital->nome }}</h4>
-          <h6 class="titulo-table">Submissão irá até o dia <span style="color: rgb(0, 0, 0);">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6>
-        </div>
-        <div class="col-sm-2">
-            <a @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao) href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-info" @else href="#" data-toggle="tooltip" data-placement="top" title="O periodo de submissão foi encerrado." @endif style="position:relative; float: right;">Criar projeto</a>
-        </div>
+<div class="container">
+  @if(isset($mensagem))
+  <div class="col-sm-12">
+      <br>
+      <div class="alert alert-success">
+          <p>{{ $mensagem }}</p>
       </div>
-    </div>
-    <hr>
-    <table class="table table-bordered">
-        <thead>
-          <tr>
-            <th scope="col">Nome do projeto</th>
-            <th scope="col">Status</th>
-            <th scope="col">Data de Criação</th>
-            <th scope="col">Opção</th>
-          </tr>
-        </thead>
-        <tbody id="projetos">
-          @foreach ($projetos as $projeto)
-            @if ($projeto->proponente_id === Auth()->user()->proponentes->id)
-              <tr>
-                <td>
-                  {{ $projeto->titulo }}
-                </td>
-                @if($projeto->status == 'Avaliado')
-                  <td style="color: rgb(6, 85, 6)">Avaliado</td>
-                @elseif($projeto->status == 'Submetido')
-                  <td style="color: rgb(0, 0, 0)">Submetido</td>
-                @elseif($projeto->status == 'Rascunho')
-                  <td style="color: rgb(0, 0, 0)">Rascunho</td>
-                @endif
-                <td>{{ date('d-m-Y', strtotime($projeto->updated_at)) }}</td>
-                <td>
-                  <div class="btn-group dropright dropdown-options">
-                      <a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                          <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
-                      </a>
-                      <div class="dropdown-menu">
-                          @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao)
-                            <a href="{{ route('trabalho.editar', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center;">
-                              Editar
+  </div>
+  @endif
+  @if(session('mensagem'))
+  <div class="col-sm-12">
+      <br>
+      <div class="alert alert-success">
+          <p>{{session('mensagem')}}</p>
+      </div>
+  </div>
+  @endif
+  <div class="row justify-content-center" style="margin-top: 2rem;">
+    <div class="col-md-11">
+      <div class="card" style="border-radius: 12px; padding:14px">
+          
+        <div class="card-body" style="margin-bottom: -2rem">
+          <div class="d-flex justify-content-between align-items-center">
+            <div class="bottomVoltar">
+              <a href="{{ route('proponente.editais') }}"  class="btn btn-secondary" style="position:relative; float: right;"><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
+            </div>
+            <div>
+              <h5 style="color: #1492E6; margin-top:0.5rem">Projetos submetidos - {{ $edital->nome }}</h5>
+              <h6 class="titulo-table" style="color: red">Submissão irá até o dia <span style="color: red">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6>
+            </div>
+            <div>
+              <a @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao) href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-info" @else href="#" data-toggle="tooltip" data-placement="top" title="O periodo de submissão foi encerrado." @endif style="position:relative; float: right;">Criar projeto</a>
+          </div>
+          </div>
+          <div  style="margin-top:-10px"><hr style="border-top: 1px solid#1492E6"></div>
+        </div>
+
+        <div class="card-body" >
+          @if(count($projetos)>0)
+            <table class="table table-bordered table-hover" style="display: block; 
+            overflow-x: auto;
+            white-space: nowrap; border-radius:10px">
+              <thead>
+                <tr>
+                  <th scope="col" style="width:100%">Nome do projeto</th>
+                  <th scope="col" style="text-align:center">Status</th>
+                  <th scope="col">Data de Criação</th>
+                  <th scope="col">Opção</th>
+                </tr>
+              </thead>
+              <tbody id="projetos">
+                @foreach ($projetos as $projeto)
+                  @if ($projeto->proponente_id === Auth()->user()->proponentes->id)
+                    <tr>
+                      <td>
+                        {{ $projeto->titulo }}
+                      </td>
+                      @if($projeto->status == 'Avaliado')
+                        <td style="color: rgb(6, 85, 6); text-align: center">Avaliado</td>
+                      @elseif($projeto->status == 'Submetido')
+                        <td style="color: rgb(0, 0, 0); text-align: center">Submetido</td>
+                      @elseif($projeto->status == 'Rascunho')
+                        <td style="color: rgb(0, 0, 0); text-align: center">Rascunho</td>
+                      @endif
+                      <td style="text-align: center">{{ date('d-m-Y', strtotime($projeto->updated_at)) }}</td>
+                      <td>
+                        <div class="dropright dropdown-options" style="width: 100%; text-align:center; float:none">
+                            <a id="options" class="dropdown-toggle btn btn-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
                             </a>
-                            <hr class="dropdown-hr">
-                          @else
-                          @endif
-                          <a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
-                            Visualizar
-                          </a>
-                          <hr class="dropdown-hr">
-                          {{-- <a href="" class="dropdown-item" style="text-align: center">
-                            Recorrer
-                          </a>
-                          <a href="" class="dropdown-item" style="text-align: center">
-                            Resultado
-                          </a> --}}
-                          <!-- Button trigger modal -->
-                          <button type="button" class="dropdown-item dropdown-item-delete" data-toggle="modal" data-target="#modal{{$projeto->id}}" style="text-align: center">
-                            <img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
+                            <div class="dropdown-menu">
+                                @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao)
+                                  <a href="{{ route('trabalho.editar', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center;">
+                                    Editar
+                                  </a>
+                                  <hr class="dropdown-hr">
+                                @else
+                                @endif
+                                <a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
+                                  Visualizar
+                                </a>
+                                <hr class="dropdown-hr">
+                                {{-- <a href="" class="dropdown-item" style="text-align: center">
+                                  Recorrer
+                                </a>
+                                <a href="" class="dropdown-item" style="text-align: center">
+                                  Resultado
+                                </a> --}}
+                                <!-- Button trigger modal -->
+                                <button type="button" class="dropdown-item dropdown-item-delete" data-toggle="modal" data-target="#modal{{$projeto->id}}" style="text-align: center">
+                                  <img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
+                                </button>
+                            </div>
+                        </div>
+                      </td>
+                    </tr>
+                  @endif
+                  <!-- Modal -->
+                  <div class="modal fade" id="modal{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+                    <div class="modal-dialog">
+                      <div class="modal-content">
+                        <div class="modal-header">
+                          <h5 class="modal-title" id="exampleModalLabel">Deletar projeto</h5>
+                          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
                           </button>
+                        </div>
+                        <div class="modal-body">
+                          <p>Você tem certeza que deseja deletar o projeto: {{ $projeto->titulo }}?</p>
+                        </div>
+                        <div class="modal-footer">
+                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
+                          <a href="{{ route('trabalho.destroy', ['id' => $projeto->id]) }}" class="btn btn-primary" style="text-align: center">
+                            Deletar
+                          </a>
+                        </div>
                       </div>
+                    </div>
                   </div>
-                </td>
-              </tr>
-            @endif
-            <!-- Modal -->
-            <div class="modal fade" id="modal{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
-              <div class="modal-dialog">
-                <div class="modal-content">
-                  <div class="modal-header">
-                    <h5 class="modal-title" id="exampleModalLabel">Deletar projeto</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                      <span aria-hidden="true">&times;</span>
-                    </button>
-                  </div>
-                  <div class="modal-body">
-                    <p>Você tem certeza que deseja deletar o projeto: {{ $projeto->titulo }}?</p>
-                  </div>
-                  <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
-                    <a href="{{ route('trabalho.destroy', ['id' => $projeto->id]) }}" class="btn btn-primary" style="text-align: center">
-                      Deletar
-                    </a>
-                  </div>
-                </div>
-              </div>
+                @endforeach
+              </tbody>
+          </table>
+          @else
+          <div class="form-row justify-content-center" style="margin-top: 5rem; margin-bottom:9rem;">
+            <div class="col-md-12" style="text-align: center; margin-bottom:20px">
+              <img src="{{asset('img/icons/logo_projeto.png')}}" style="width:200px">
+            </div>
+            <div class="col-md-12" style="text-align: center; color:#909090">
+              <h5>Nenhum projeto submetido!</h5>
+            </div>
+            <div class="col-md-12" style="text-align: center;">
+              <a href="{{ route('trabalho.index', ['id' => $edital->id] )}}">Cliquei aqui para submeter um projeto.</a>
             </div>
-          @endforeach
-        </tbody>
-    </table>
+          </div>
+          @endif
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 @endsection
 
diff --git a/routes/web.php b/routes/web.php
index 68d3e08e4c5d33fff43c0bc0999c6e734ae380d0..fea6a04a219ca8f600355d1bfdef8eec29a7ae80 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,7 +29,7 @@ Route::get( '/proponente/cadastro',   'ProponenteController@create'
 Route::post('/proponente/cadastro',   'ProponenteController@store'                  )->name('proponente.store');
 Route::get( '/proponente/editais',    'ProponenteController@editais'                )->name('proponente.editais');
 Route::get( '/projetos-submetidos',   'ProponenteController@projetosDoProponente'   )->name('proponente.projetos');
-Route::get( '/projetos-edital/{id}',       'ProponenteController@projetosEdital'         )->name('proponente.projetosEdital');
+Route::get( '/projetos-edital/{id}',       'ProponenteController@projetosEdital'         )->name('proponente.projetosEdital')->middleware('auth');
 
 
 //######### Rotas Administrador #################################