diff --git a/inicial/models.py b/inicial/models.py
index 9bd8d848..59c49b15 100644
--- a/inicial/models.py
+++ b/inicial/models.py
@@ -104,10 +104,14 @@ class Meta:
         verbose_name = "dados"
         verbose_name_plural = "Dados"
 
-    SEXO = [
-        ("femininino", "Feminino"),
-        ("masculino", "Masculino"),
-        ("na","Não informado")
+    GENERO = [
+        ("na","Não informado"),
+        ("homem-cis", "Homem cis"),
+        ("homem-trans", "Homem trans"),
+        ("mulher-cis", "Mulher cis"),
+        ("mulher-trans", "Mulher trans"),
+        ("nao-binario", "Não-binário"),
+        ("outro", "Outro")
     ]
 
     TIPO_SANGUINIO = [
@@ -131,9 +135,8 @@ class Meta:
     ]
 
     usuario = models.OneToOneField(User,on_delete=models.CASCADE, primary_key=True)
-    nome = models.CharField(max_length=200, null=False, blank=False, default="Não informado")
-    idade = models.IntegerField(null=False, blank=False, default=0)
-    sexo = models.CharField(max_length=20, null=False, blank=False, default="na", choices=SEXO)
+    data_nascimento = models.DateField(null=False, blank=False, default=timezone.now)
+    genero = models.CharField(max_length=20, null=False, blank=False, default="na", choices=GENERO)
     profissao = models.CharField(max_length=200, null=False, blank=False, default="Não informada")
     endereco = models.CharField(max_length=200, null=False, blank=False, default="Não informado")
     telefone = models.CharField(max_length=20, null=False, blank=False, default="Não informado")
diff --git a/inicial/signals.py b/inicial/signals.py
index 557cbff2..08e4ce08 100644
--- a/inicial/signals.py
+++ b/inicial/signals.py
@@ -13,7 +13,7 @@ def update_time(sender, instance, created, **kwargs):
         risco = instance.risco
         duracao = Avaliacao.objects.filter(hospital=hospital).filter(risco=risco).aggregate(Avg("duracao", default=timedelta(minutes=0)))
         minutos = round(duracao["duracao__avg"].seconds / 60)
-        
+
         avaliacao = Avaliacao.objects.filter(hospital=hospital).aggregate(Avg("avaliacao", default=0))
         nota = avaliacao["avaliacao__avg"]
         hospital.nota = nota
@@ -33,11 +33,5 @@ def update_time(sender, instance, created, **kwargs):
         if risco == "NAO_URGENTE":
             hospital.tempo_nao_urgente = minutos
 
-        hospital.atualizacao = timezone.now
+        hospital.atualizacao = timezone.now()
         hospital.save()
-
-@receiver(post_save, sender=User)
-def create_data(sender, instance, created, **kwargs):
-    if created:
-        dados = Dados(usuario=instance)
-        dados.save()
\ No newline at end of file
diff --git a/inicial/static/styles/css_criarconta.css b/inicial/static/styles/css_criarconta.css
deleted file mode 100644
index 3dc64485..00000000
--- a/inicial/static/styles/css_criarconta.css
+++ /dev/null
@@ -1,319 +0,0 @@
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&family=Oleo+Script:wght@400;700&family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
-
-:root{
-    --clr:#1D7FF1;
-    --clr2: #002653;
-    --fonte-titulo: 'Oleo script', sans-serif; 
-    --fonte-padrao: 'Inter', sans-serif;
-    --fonte-destaque: 'Open sans', sans-serif;
-    --fonte-titulo: 'Oleo script', sans-serif; 
-}
-*{
-    margin:0;
-}
-
-body{
-    background-image:url('bg_criarconta.jpg');
-    background-size:cover;
-    font-family: var(--fonte-padrao);
-}
-
-/*main{*/
-/*#regForm{*/
-.multi-step-form-container{
-    background-color:white;
-    width:700px;
-    position:relative; 
-    /* right:30px;
-    margin-top:0px; */
-    padding:30px;
-    text-align:center;
-    border-bottom-left-radius: 20px;
-    border-bottom-right-radius: 20px;
-    /* margin: auto; */
-    z-index: 99; 
-    top: 1%;
-    left: 49%;
-    transform: translateX(-50%);
-    /* top: 0px;
-    bottom: 0px; */
-    /* height: 420px; */
-}
-
-input[type=text], input[type=password]{
-    font-family: var(--fonte-destaque);
-    width:100%;
-    display:inline-block;
-    border-width: 0px 0px 1px 0px;
-    /*border-color*/
-    margin-top: 12px;
-    margin-bottom: 30px;
-}
-
-input[type=text]:focus, input[type=password]:focus{
-    background-color:#ededed;
-    outline:none;
-}
-
-/*#continuar{*/
-#nextBtn{
-    background-color:#28c47e;
-    outline:none;
-    border-width:0;
-    color:white;
-    padding:14px 20px;
-    border-radius:10px;
-    text-transform:uppercase;
-    margin:8px;
-    cursor:pointer;
-    /*width:100%;*/
-    opacity:0.9;
-    box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
-}
-
-/*#continuar:hover{*/
-#nextBtn:hover{
-    opacity:1;
-}
-
-input-invalid{
-    background-color:#ffdddd;
-}
-
-.tab{
-    display:none;
-}
-
-/* Make circles that indicate the steps of the form: */
-.step {
-    height: 15px;
-    width: 15px;
-    margin: 0 2px;
-    background-color: #bbbbbb;
-    border: none;
-    border-radius: 50%;
-    display: inline-block;
-    opacity: 0.5;
-  }
-  
-  /* Mark the active step: */
-  .step.active {
-    opacity: 1;
-  }
-  
-  /* Mark the steps that are finished and valid: */
-  .step.finish {
-    background-color: #04AA6D;
-  }
-
-  h2 {
-    margin: 0;
-}
-
-/*#multi-step-form-container {
-    /*margin-top: 5rem;
-    margin-top:0;
-    padding:30px;
-    background-color:pink;
-    width:600px;
-    left:500px;
-    position:relative;
-}*/
-
-.text-center {
-    text-align: center;
-}
-.mx-auto {
-    margin-left: auto;
-    margin-right: auto;
-}
-.pl-0 {
-    padding-left: 0;
-}
-.button {
-    padding: 0.7rem 1.5rem;
-    border: 1px solid #4361ee;
-    background-color: #4361ee;
-    color: #fff;
-    border-radius: 5px;
-    cursor: pointer;
-    text-transform:uppercase;
-    /*float:right;
-    margin-left:10px;*/
-}
-.submit-btn {
-    border: 1px solid #0e9594;
-    background-color: #0e9594;
-    /*float:right;*/
-}
-.mt-3 {
-    /* margin-top: 2rem; */
-    position: relative;
-    top: 0px;
-    left: 50%;
-    transform: translateX(-50%);
-}
-.mt-3 > button{
-    font-family: var(--fonte-padrao);
-    margin: 20px 0;
-}
-.d-none {
-    display: none;
-}
-.form-step {
-    position: absolute;
-    border: /*1px solid rgba(0, 0, 0, 0.1)*/0;
-    /*border-radius: 20px;
-    padding: 3rem;*/
-    top: 50%;
-    left: 50%;
-    transform: translateX(-50%);
-}
-.font-normal {
-    font-weight: normal;
-}
-ul.form-stepper {
-    counter-reset: section;
-    margin-bottom: 3rem;
-}
-ul.form-stepper .form-stepper-circle {
-    position: relative;
-}
-ul.form-stepper .form-stepper-circle span {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translateY(-50%) translateX(-50%);
-}
-.form-stepper-horizontal {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-pack: justify;
-    -ms-flex-pack: justify;
-    justify-content: space-between;
-}
-ul.form-stepper > li:not(:last-of-type) {
-    margin-bottom: 0.625rem;
-    -webkit-transition: margin-bottom 0.4s;
-    -o-transition: margin-bottom 0.4s;
-    transition: margin-bottom 0.4s;
-}
-.form-stepper-horizontal > li:not(:last-of-type) {
-    margin-bottom: 0 !important;
-}
-.form-stepper-horizontal li {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1;
-    -webkit-box-align: start;
-    -ms-flex-align: start;
-    align-items: start;
-    -webkit-transition: 0.5s;
-    transition: 0.5s;
-}
-.form-stepper-horizontal li:not(:last-child):after {
-    position: relative;
-    -webkit-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1;
-    height: 1px;
-    content: "";
-    top: 32%;
-}
-.form-stepper-horizontal li:after {
-    background-color: #dee2e6;
-}
-.form-stepper-horizontal li.form-stepper-completed:after {
-    background-color: #4da3ff;
-}
-.form-stepper-horizontal li:last-child {
-    flex: unset;
-}
-ul.form-stepper li a .form-stepper-circle {
-    display: inline-block;
-    width: 40px;
-    height: 40px;
-    margin-right: 0;
-    line-height: 1.7rem;
-    text-align: center;
-    background: rgba(0, 0, 0, 0.38);
-    border-radius: 50%;
-}
-.form-stepper .form-stepper-active .form-stepper-circle {
-    background-color: #4361ee !important;
-    color: #fff;
-}
-.form-stepper .form-stepper-active .label {
-    color: #4361ee !important;
-}
-.form-stepper .form-stepper-active .form-stepper-circle:hover {
-    background-color: #4361ee !important;
-    color: #fff !important;
-}
-.form-stepper .form-stepper-unfinished .form-stepper-circle {
-    background-color: #f8f7ff;
-}
-.form-stepper .form-stepper-completed .form-stepper-circle {
-    background-color: #0e9594 !important;
-    color: #fff;
-}
-.form-stepper .form-stepper-completed .label {
-    color: #0e9594 !important;
-}
-.form-stepper .form-stepper-completed .form-stepper-circle:hover {
-    background-color: #0e9594 !important;
-    color: #fff !important;
-}
-.form-stepper .form-stepper-active span.text-muted {
-    color: #fff !important;
-}
-.form-stepper .form-stepper-completed span.text-muted {
-    color: #fff !important;
-}
-.form-stepper .label {
-    font-size: 1rem;
-    margin-top: 0.5rem;
-}
-.form-stepper a {
-    cursor: default;
-}
-.login_google{
-    margin: 10px;
-    padding: 10px;
-    color: #F14336;
-    border-color: #F14336;
-    border-radius: 5px;
-    width: 370px;
-    height: 40px;
-    /* font-family: Josefin Sans; */
-    box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
-}
-.login_google:hover{
-    box-shadow: none;
-    color: #822b25;
-    border-color:#822b25;
-}
-.login_facebook{
-    display: block;
-    padding: 10px;
-    color: var(--clr);
-    border-color: var(--clr);
-    margin-left: 10px;
-    border-radius: 5px;
-    width: 370px;
-    height: 40px;
-    /* font-family: Josefin Sans; */
-    box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
-}
-.login_facebook:hover{
-    color: #002653;
-    border-color: #002653;
-    background-color: #ededed;
-    box-shadow: none;
-}
\ No newline at end of file
diff --git a/inicial/static/styles/css_criarconta_2.css b/inicial/static/styles/css_criarconta_2.css
deleted file mode 100644
index 4da385ab..00000000
--- a/inicial/static/styles/css_criarconta_2.css
+++ /dev/null
@@ -1,251 +0,0 @@
-*{
-    margin:0;
-}
-
-body{
-    background-image:url('../img/bg_criarconta.jpg');
-    background-size:cover;
-}
-
-/*main{*/
-/*#regForm{*/
-.multi-step-form-container{
-    background-color:white;
-    width:700px;
-    position:absolute;
-    right:30px;
-    margin-top:0px;
-    padding:30px;
-    text-align:center;
-    border-bottom-left-radius: 20px;
-    border-bottom-right-radius: 20px;
-}
-
-input[type=text], input[type=password]{
-    width:100%;
-    display:inline-block;
-    border-width: 0px 0px 1px 0px;
-    /*border-color*/
-}
-
-input[type=text]:focus, input[type=password]:focus{
-    background-color:#ededed;
-    outline:none;
-}
-
-/*#continuar{*/
-#nextBtn{
-    background-color:#28c47e;
-    outline:none;
-    border-width:0;
-    color:white;
-    padding:14px 20px;
-    border-radius:10px;
-    text-transform:uppercase;
-    margin:8px;
-    cursor:pointer;
-    /*width:100%;*/
-    opacity:0.9;
-    box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
-}
-
-/*#continuar:hover{*/
-#nextBtn:hover{
-    opacity:1;
-}
-
-input-invalid{
-    background-color:#ffdddd;
-}
-
-.tab{
-    display:none;
-}
-
-/* Make circles that indicate the steps of the form: */
-.step {
-    height: 15px;
-    width: 15px;
-    margin: 0 2px;
-    background-color: #bbbbbb;
-    border: none;
-    border-radius: 50%;
-    display: inline-block;
-    opacity: 0.5;
-  }
-  
-  /* Mark the active step: */
-  .step.active {
-    opacity: 1;
-  }
-  
-  /* Mark the steps that are finished and valid: */
-  .step.finish {
-    background-color: #04AA6D;
-  }
-
-  h2 {
-    margin: 0;
-}
-
-/*#multi-step-form-container {
-    /*margin-top: 5rem;
-    margin-top:0;
-    padding:30px;
-    background-color:pink;
-    width:600px;
-    left:500px;
-    position:relative;
-}*/
-
-.text-center {
-    text-align: center;
-}
-.mx-auto {
-    margin-left: auto;
-    margin-right: auto;
-}
-.pl-0 {
-    padding-left: 0;
-}
-.button {
-    padding: 0.7rem 1.5rem;
-    border: 1px solid #4361ee;
-    background-color: #4361ee;
-    color: #fff;
-    border-radius: 5px;
-    cursor: pointer;
-    text-transform:uppercase;
-    /*float:right;
-    margin-left:10px;*/
-}
-.submit-btn {
-    border: 1px solid #0e9594;
-    background-color: #0e9594;
-    /*float:right;*/
-}
-.mt-3 {
-    margin-top: 2rem;
-}
-.d-none {
-    display: none;
-}
-.form-step {
-    border: /*1px solid rgba(0, 0, 0, 0.1)*/0;
-    /*border-radius: 20px;
-    padding: 3rem;*/
-}
-.font-normal {
-    font-weight: normal;
-}
-ul.form-stepper {
-    counter-reset: section;
-    margin-bottom: 3rem;
-}
-ul.form-stepper .form-stepper-circle {
-    position: relative;
-}
-ul.form-stepper .form-stepper-circle span {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translateY(-50%) translateX(-50%);
-}
-.form-stepper-horizontal {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-pack: justify;
-    -ms-flex-pack: justify;
-    justify-content: space-between;
-}
-ul.form-stepper > li:not(:last-of-type) {
-    margin-bottom: 0.625rem;
-    -webkit-transition: margin-bottom 0.4s;
-    -o-transition: margin-bottom 0.4s;
-    transition: margin-bottom 0.4s;
-}
-.form-stepper-horizontal > li:not(:last-of-type) {
-    margin-bottom: 0 !important;
-}
-.form-stepper-horizontal li {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1;
-    -webkit-box-align: start;
-    -ms-flex-align: start;
-    align-items: start;
-    -webkit-transition: 0.5s;
-    transition: 0.5s;
-}
-.form-stepper-horizontal li:not(:last-child):after {
-    position: relative;
-    -webkit-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1;
-    height: 1px;
-    content: "";
-    top: 32%;
-}
-.form-stepper-horizontal li:after {
-    background-color: #dee2e6;
-}
-.form-stepper-horizontal li.form-stepper-completed:after {
-    background-color: #4da3ff;
-}
-.form-stepper-horizontal li:last-child {
-    flex: unset;
-}
-ul.form-stepper li a .form-stepper-circle {
-    display: inline-block;
-    width: 40px;
-    height: 40px;
-    margin-right: 0;
-    line-height: 1.7rem;
-    text-align: center;
-    background: rgba(0, 0, 0, 0.38);
-    border-radius: 50%;
-}
-.form-stepper .form-stepper-active .form-stepper-circle {
-    background-color: #4361ee !important;
-    color: #fff;
-}
-.form-stepper .form-stepper-active .label {
-    color: #4361ee !important;
-}
-.form-stepper .form-stepper-active .form-stepper-circle:hover {
-    background-color: #4361ee !important;
-    color: #fff !important;
-}
-.form-stepper .form-stepper-unfinished .form-stepper-circle {
-    background-color: #f8f7ff;
-}
-.form-stepper .form-stepper-completed .form-stepper-circle {
-    background-color: #0e9594 !important;
-    color: #fff;
-}
-.form-stepper .form-stepper-completed .label {
-    color: #0e9594 !important;
-}
-.form-stepper .form-stepper-completed .form-stepper-circle:hover {
-    background-color: #0e9594 !important;
-    color: #fff !important;
-}
-.form-stepper .form-stepper-active span.text-muted {
-    color: #fff !important;
-}
-.form-stepper .form-stepper-completed span.text-muted {
-    color: #fff !important;
-}
-.form-stepper .label {
-    font-size: 1rem;
-    margin-top: 0.5rem;
-}
-.form-stepper a {
-    cursor: default;
-}
\ No newline at end of file
diff --git a/inicial/static/styles/css_criarconta_3.css b/inicial/static/styles/css_criarconta_3.css
index 53bf1789..23692027 100644
--- a/inicial/static/styles/css_criarconta_3.css
+++ b/inicial/static/styles/css_criarconta_3.css
@@ -6,7 +6,7 @@
 }
 
 body{
-    background-image:url('bg_criarconta.jpg');
+    background-image:url('../img/bg_criarconta.jpg');
     background-size:cover;
     /*background-color: darkolivegreen;*/
 }
diff --git a/inicial/views.py b/inicial/views.py
index dedfe905..f28e5884 100644
--- a/inicial/views.py
+++ b/inicial/views.py
@@ -117,38 +117,43 @@ def duvidas_frequentes(request):
 
 def cadastro(request):
 
-    cadastro = CadastroForms()
-
     if request.method == "POST":
-        cadastro = CadastroForms(request.POST)
-
-        if cadastro.is_valid():
-            if cadastro["senha_1"].value() != cadastro["senha_2"].value():
-                messages.error(request, "Digite senhas iguais para concluir o cadastro")
-                return redirect('cadastro')
 
-            nome = cadastro["nome_cadastro"].value()
-            email = cadastro["email"].value()
-            senha = cadastro["senha_1"].value()
+        email = request.POST["email"]
+        senha_1 = request.POST["senha_1"]
+        senha_2 = request.POST["senha_2"]
+        nome = request.POST["nome"]
+        sobrenome = request.POST["sobrenome"]
+        data_nascimento = datetime.strptime(request.POST["data_nascimento"],"%Y-%m-%d")
+        genero = request.POST["genero"]
+
+        if User.objects.filter(email=email).exists():
+            messages.error(request, "Email já cadastrado")
+            return redirect('cadastro')
+        
+        if senha_1 != senha_2:
+            messages.error(request, "Digite senhas iguais para concluir o cadastro")
+            return redirect('cadastro')
+
+        usuario = User.objects.create_user(
+            username=email,
+            email=email,
+            password=senha_1,
+            first_name=nome,
+            last_name=sobrenome
+        )
 
-            if User.objects.filter(username=nome).exists() or User.objects.filter(email=email).exists():
-                messages.error(request, "Usuário já existente")
-                return redirect('cadastro')
+        usuario.save()
 
-            usuario = User.objects.create_user(
-                username=nome,
-                email=email,
-                password=senha
-            )
+        Dados.objects.create(usuario=usuario, data_nascimento=data_nascimento, genero=genero)
 
-            usuario.save()
-            login(request, usuario)
-            messages.success(request, "Usuário cadastrado com sucesso!")
-            return redirect('index')
+        login(request, usuario)
+        messages.success(request, "Usuário cadastrado com sucesso!")
+        return redirect('index')
 
     context = {"cadastro":cadastro}
 
-    return render(request, 'inicial/criar_conta.html', context)
+    return render(request, 'inicial/criar_conta_2.html', context)
 
 def login_site(request, view_name):
     if request.method == "POST":
@@ -383,11 +388,11 @@ def editar_dados(request):
         if dados["nome"] != "":
             novos_dados.nome = dados["nome"]
 
-        if dados["idade"] != "":
-            novos_dados.idade = dados["idade"]
+        if dados["data_nascimento"] != "":
+            novos_dados.idade = datetime.strptime(request.POST["data_nascimento"],"%Y-%m-%d")
         
-        if "sexo" in dados:
-            novos_dados.sexo = dados["sexo"]
+        if "genero" in dados:
+            novos_dados.sexo = dados["genero"]
 
         if dados["profissao"] != "":
             novos_dados.profissao = dados["profissao"]
diff --git a/templates/inicial/criar_conta.html b/templates/inicial/criar_conta.html
deleted file mode 100644
index 06c1fc2f..00000000
--- a/templates/inicial/criar_conta.html
+++ /dev/null
@@ -1,169 +0,0 @@
-{% load static %}
-
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Cadastro | MedConnect</title>
-    <link rel="stylesheet" href="{% static 'styles/css_criarconta_2.css' %}">
-</head>
-<body>
-    <div class="multi-step-form-container">
-
-      <!--etapas do cadastro-->
-      <ul class="form-stepper form-stepper-horizontal text-center mx-auto p1-0">
-        <!--etapa 1-->
-        <li class="form-stepper-active text-center form-stepper-list" step="1">
-            <a class="mx-2">
-                <span class="form-stepper-circle">
-                    <span>1</span>
-                </span>
-                <div class="label">Informações Básicas</div>
-            </a>
-        </li>
-        <!--etapa 2-->
-        <li class="form-stepper-unfinished text-center form-stepper-list" step="2">
-            <a class="mx-2">
-                <span class="form-stepper-circle text-muted">
-                    <span>2</span>
-                </span>
-                <div class="label text-muted">Conclusão</div>
-            </a>
-        </li>
-
-        </ul>
-
-    <!--<form id="regForm" action="">-->
-    <form id="userAccountSetupForm" name="userAccountSetupForm" enctype="multipart/form-data" method="POST">
-        {% csrf_token %}
-
-        <!--conteúdo step 1
-        <div class="tab">
-            <p><input placeholder="Digite seu email" oninput="this.className = ''"></p>
-            <p><input placeholder="Digite sua senha" oninput="this.className = ''"></p>
-        </div>-->
-        <section id="step-1" class="form-step">
-            <h2 class="font-normal">Informações Básicas</h2>
-            <!--campos de input do passo 1-->
-            {% for message in messages %}
-            <div class="mt-3">
-                <h3>{{message}}</h3>
-            </div>
-            {% endfor %}
-            <div class="mt-3">
-            <!--Vão aqui os campos de input..-->
-            <!--<img src="https://electricwoodlands.com/wp-content/uploads/2021/06/Google_NoHover.png" style="width:60%;height:auto;">
-            <img src="https://electricwoodlands.com/wp-content/uploads/2021/06/FB_NoHover.png" style="width:60%;height:auto;">-->
-            {% for field in  cadastro.visible_fields %}
-                <label for="{{ field.id_for_label }}"><b><br>{{ field.label }}</b></label>
-                    {{ field }}
-            {% endfor %}
-            </div>
-            <div class="mt-3">
-                <button class="button btn-navigate-form-step" type="button" step_number="2">Próximo</button>
-            </div>
-        </section>
-
-        <!--conteúdo step 2
-        <div class="tab">
-            <p><input placeholder="Primeiro nome" oninput="this.className = ''"></p>
-            <p><input placeholder="Sobrenome" oninput="this.className = ''"></p>
-        </div>-->
-        <section id="step-2" class="form-step d-none">
-          <h2 class="font-normal">Social profiles</h2>
-          <!--Campos de input do step 2-->
-          <div class="mt-3">
-              Vão aqui os campos de imput..
-          </div>
-          <div class="mt-3">
-              <button class="button btn-navigate-form-step" type="button" step_number="1">Anterior</button>
-              <button class="button submit-btn" type="submit">Concluir cadastro</button>
-          </div>
-      </section>
-
-        <!--<div class="clearfix">
-        <div style="overflow:auto;">
-            <div style="float:right;">
-                <button type="button" id="prevBtn" onclick="nextPrev(-1)">Previous</button>
-                <button id="nextBtn" type="button" onclick="nextPrev(1)">Continuar</button>
-            </div>
-        </div>-->
-    </form>
-  </div>
-    <script>
-      /**
- * Define a function to navigate betweens form steps.
- * It accepts one parameter. That is - step number.
- */
-const navigateToFormStep = (stepNumber) => {
-    /**
-     * Hide all form steps.
-     */
-    document.querySelectorAll(".form-step").forEach((formStepElement) => {
-        formStepElement.classList.add("d-none");
-    });
-    /**
-     * Mark all form steps as unfinished.
-     */
-    document.querySelectorAll(".form-stepper-list").forEach((formStepHeader) => {
-        formStepHeader.classList.add("form-stepper-unfinished");
-        formStepHeader.classList.remove("form-stepper-active", "form-stepper-completed");
-    });
-    /**
-     * Show the current form step (as passed to the function).
-     */
-    document.querySelector("#step-" + stepNumber).classList.remove("d-none");
-    /**
-     * Select the form step circle (progress bar).
-     */
-    const formStepCircle = document.querySelector('li[step="' + stepNumber + '"]');
-    /**
-     * Mark the current form step as active.
-     */
-    formStepCircle.classList.remove("form-stepper-unfinished", "form-stepper-completed");
-    formStepCircle.classList.add("form-stepper-active");
-    /**
-     * Loop through each form step circles.
-     * This loop will continue up to the current step number.
-     * Example: If the current step is 3,
-     * then the loop will perform operations for step 1 and 2.
-     */
-    for (let index = 0; index < stepNumber; index++) {
-        /**
-         * Select the form step circle (progress bar).
-         */
-        const formStepCircle = document.querySelector('li[step="' + index + '"]');
-        /**
-         * Check if the element exist. If yes, then proceed.
-         */
-        if (formStepCircle) {
-            /**
-             * Mark the form step as completed.
-             */
-            formStepCircle.classList.remove("form-stepper-unfinished", "form-stepper-active");
-            formStepCircle.classList.add("form-stepper-completed");
-        }
-    }
-};
-/**
- * Select all form navigation buttons, and loop through them.
- */
-document.querySelectorAll(".btn-navigate-form-step").forEach((formNavigationBtn) => {
-    /**
-     * Add a click event listener to the button.
-     */
-    formNavigationBtn.addEventListener("click", () => {
-        /**
-         * Get the value of the step.
-         */
-        const stepNumber = parseInt(formNavigationBtn.getAttribute("step_number"));
-        /**
-         * Call the function to navigate to the target form step.
-         */
-        navigateToFormStep(stepNumber);
-    });
-});
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/templates/inicial/criar_conta_2.html b/templates/inicial/criar_conta_2.html
index 7a0bb40d..5b506305 100644
--- a/templates/inicial/criar_conta_2.html
+++ b/templates/inicial/criar_conta_2.html
@@ -1,30 +1,35 @@
+{% load static %}
+
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Criar Conta | MedConnect</title>
-    <link rel="stylesheet" href="css_criarconta_3.css">
+    <link rel="stylesheet" href="{% static "styles/css_criarconta_3.css"%}">
 </head>
 <body>
     <div class="multi-step-form-container">
-
-        <form id="regForm" action="">
+        <form id="regForm" action="{% url "cadastro" %}" method="POST">
+          {% csrf_token %}
             <div class="tab">
                 <h1>Criar conta -<br>etapa 1 de 2</h1>
-                <img src="https://electricwoodlands.com/wp-content/uploads/2021/06/Google_NoHover.png" style="width:60%;height:auto;">
-                <img src="https://electricwoodlands.com/wp-content/uploads/2021/06/FB_NoHover.png" style="width:60%;height:auto;">
+                <!--<img src="https://electricwoodlands.com/wp-content/uploads/2021/06/Google_NoHover.png" style="width:60%;height:auto;">
+                <img src="https://electricwoodlands.com/wp-content/uploads/2021/06/FB_NoHover.png" style="width:60%;height:auto;">-->
+                {% for message in messages %}
+                <p style="font-weight: bold;">{{ message }}</p>
+                {% endfor %}
                 <div class="formtag">EMAIL:</div>
                 <p>
-                  <input type="email" placeholder="Digite aqui o seu e-mail" oninput="this.className = ''">
+                  <input name="email" type="email" placeholder="Digite aqui o seu e-mail" oninput="this.className = ''">
                 </p>
                 <div class="formtag">Senha:</div>
                 <p>
-                  <input type="password" required="required" pattern="{8,}" placeholder="Digite aqui a sua senha" oninput="this.classeName = ''">
+                  <input name="senha_1" type="password" required="required" pattern="{8,}" placeholder="Digite aqui a sua senha" oninput="this.classeName = ''">
                 </p>
                 <div class="formtag">Confirmar senha:</div>
                 <p>
-                  <input type="password" placeholder="Digite novamente a sua senha" oninput="this.classeName = ''">
+                  <input name="senha_2" type="password" placeholder="Digite novamente a sua senha" oninput="this.classeName = ''">
                 </p>
                 <p id="infosenha">a. Mínimo de 8 caracteres<br>b. Mínimo de <!--2--> 1 número<!--s--><br>c. Mínimo de 1 caractere especial<br>d. Mínimo de 1 letra maiúscula<br>e. Mínimo de 1 letra minúscula</p>
             </div>
@@ -36,14 +41,14 @@ <h1>Criar conta -<br>etapa 2 de 2</h1>
                       <div class="formtag">Nome:
                       </div>
                       <p>
-                        <input placeholder="Digite aqui seu nome" class="input2" oninput="this.className = ''">
+                        <input name="nome" placeholder="Digite aqui seu nome" class="input2" oninput="this.className = ''">
                       </p>
                     </div>
                     <div class="item-2">
                       <div class="formtag">Sobrenome:
                       </div>
                       <p>
-                        <input placeholder="Digite aqui seu sobrenome" class="input2" oninput="this.className = ''">
+                        <input name="sobrenome" placeholder="Digite aqui seu sobrenome" class="input2" oninput="this.className = ''">
                       </p>
                     </div>
                   </div>
@@ -52,7 +57,7 @@ <h1>Criar conta -<br>etapa 2 de 2</h1>
                     <div class="formtag">Data de nascimento: (DD/MM/AA)
                     </div>
                     <p>
-                      <input type="date" placeholder="Digite aqui sua data de nascimento" class="input3" oninput="this.className = ''">
+                      <input name="data_nascimento" type="date" placeholder="Digite aqui sua data de nascimento" class="input3" oninput="this.className = ''">
                     </p>
                   </div>
                   <div class="item-2">
@@ -71,8 +76,8 @@ <h1>Criar conta -<br>etapa 2 de 2</h1>
                         <option value="none" selected disabled hidden>Selecione</option>
                         <option value="homem-cis">Homem cis</option>
                         <option value="homem-trans">Homem trans</option>
-                        <option value="mulher-trans">Mulher cis</option>
-                        <option value="mulher-cis">Mulher trans</option>
+                        <option value="mulher-cis">Mulher cis</option>
+                        <option value="mulher-trans">Mulher trans</option>
                         <option value="nao-binario">Não-binário</option>
                         <option value="outro">Outro</option>
                       </select>
diff --git a/templates/inicial/editardados.html b/templates/inicial/editardados.html
index 5480be6a..2a91ae6f 100644
--- a/templates/inicial/editardados.html
+++ b/templates/inicial/editardados.html
@@ -53,19 +53,20 @@ <h1>MEUS DADOS</h1>
                 <input name="nome" type="text" placeholder="Insira aqui seu nome completo">
             </div>
             <div class="group">
-                <span>Idade:</span>
-                <input name="idade" type="number" id="idade">
+                <span>Data de nascimento:</span>
+                <input name="data_nascimento" type="date" id="idade">
             </div>
             <div class="group">
-                <span>Sexo:</span>
-                <div>
-                    <input type="radio" id="feminino" name="sexo" value="feminino">
-                    <label for="feminino">Feminino</label>
-                </div>
-                <div>
-                    <input type="radio" id="masculino" name="sexo" value="masculino">
-                    <label for="masculino">Masculino</label>
-                </div>
+                <span>Genero:</span>
+                <select name="genero" class="genero">
+                    <option value="none" selected disabled hidden>Selecione</option>
+                    <option value="homem-cis">Homem cis</option>
+                    <option value="homem-trans">Homem trans</option>
+                    <option value="mulher-cis">Mulher cis</option>
+                    <option value="mulher-trans">Mulher trans</option>
+                    <option value="nao-binario">Não-binário</option>
+                    <option value="outro">Outro</option>
+                  </select>
             </div>
                 <!--<input type="radio" id="feminino" name="feminino" value="feminino">
                 <label for="feminino">Feminino</label>-->
diff --git a/templates/inicial/locaisdeatendimento.html b/templates/inicial/locaisdeatendimento.html
index b2e511eb..d90f7443 100644
--- a/templates/inicial/locaisdeatendimento.html
+++ b/templates/inicial/locaisdeatendimento.html
@@ -45,7 +45,7 @@
                 {% for hospital in hospitais %}
                 <li>
                     <div class="nome_local">
-                        <h3><strong>{{ hospital.nome }}</strong></h3>
+                        <h3><strong><a style="text-decoration:none; color:inherit;" href="{% url "mais_informacoes" hospital.cnes %}">{{ hospital.nome }}<a></strong></h3>
                         <span>{{ hospital.endereco }}. CEP: {{ hospital.cep }}</span> 
                     </div>
                     <div class="informacoes">
diff --git a/templates/inicial/maisinformacoes.html b/templates/inicial/maisinformacoes.html
index 611a46e1..b40a7300 100644
--- a/templates/inicial/maisinformacoes.html
+++ b/templates/inicial/maisinformacoes.html
@@ -148,7 +148,6 @@ <h1><strong>INFORMAÇÕES ADICIONAIS</strong></h1>
             <li>PEDIÁTRICO:<span>{{ hospital.uti_pediatrico }}</span></li>
             <li>NEONATAL:<span>{{ hospital.uti_neonatal }}</span></li>
             <li>QUEIMADO:<span>{{ hospital.uti_queimado }}</span></li>
-            <!-- <li>CORONARIANA:<span>x</span></li> -->
         </ul>
         <h1><strong>ESCALA DE SERVIÇOS E MEDICAMENTOS DISPONÍVEIS</strong></h1>
         <hr/>
@@ -168,7 +167,6 @@ <h1><strong>ESCALA DE SERVIÇOS E MEDICAMENTOS DISPONÍVEIS</strong></h1>
                 <a href="https://info.saude.df.gov.br/transparenciaativanovo/">🞄 Portal "Transparência e Prestação de Contas" - SES-DF.</a>
             </div>
         </div>
-            <!-- <div class="detalhamento">ESCALA DO DIA:</div> -->
     </main>
     <footer>
         <p>MedConnect, c2023.</p>
diff --git a/templates/inicial/meusdados.html b/templates/inicial/meusdados.html
index 2d692d74..b4473499 100644
--- a/templates/inicial/meusdados.html
+++ b/templates/inicial/meusdados.html
@@ -50,11 +50,11 @@ <h1>MEUS DADOS
             <hr/>
         <!-- <div id="dados_gerais"> -->
         <div class="general_container">
-            <span id="nome_completo">Nome completo:<span id="nome">{{ user.dados.nome }}</span></span>
+            <span id="nome_completo">Nome completo:<span id="nome">{{ user.first_name }} {{user.last_name}}</span></span>
     
-            <span>Idade:<span id="idade">{{ user.dados.idade }}</span></span>
+            <span>Data de nascimento:<span id="idade">{{ user.dados.data_nascimento|date:"d/m/Y" }}</span></span>
                 
-            <span>Sexo:<span id="sexo">{{ user.dados.get_sexo_display}}</span></span>
+            <span>Sexo:<span id="sexo">{{ user.dados.get_genero_display}}</span></span>
                 
             <span>Profissão:<span id="profissao">{{ user.dados.profissao }}</span></span>