diff --git a/admin/admin.db b/admin/admin.db
index 217dc6f..d264303 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin1/cadastros/tags/exec.php b/admin1/cadastros/tags/exec.php
index 37f41d0..296a150 100755
--- a/admin1/cadastros/tags/exec.php
+++ b/admin1/cadastros/tags/exec.php
@@ -31,7 +31,9 @@ include_once (dirname ( __FILE__ ) . "/../../../admin/php/login.php");
 $funcoesEdicao = array (
 		"ADICIONAR",
 		"ALTERAR",
-		"EXCLUIR"
+		"EXCLUIR",
+		"LISTA",
+		"LISTAUNICO"
 );
 if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) {
 	if (verificaOperacaoSessao ( "admin/html/arvore" ) === false) {
@@ -70,6 +72,18 @@ switch ($funcao) {
 		retornaJSON ( $dados );
 		exit ();
 		break;
+	case "LISTAUNICO" :
+		$dados = pegaDados ( "SELECT id_tag, nome from ".$esquemaadmin."i3geoadmin_tags WHERE id_tag = $id_tag ", $dbh, false );
+		if ($dados === false) {
+			$dbhw = null;
+			$dbh = null;
+			header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
+			exit ();
+		}
+		$dbhw = null;
+		$dbh = null;
+		retornaJSON ( $dados );
+		break;
 	case "LISTA" :
 		$dados = pegaDados ( "SELECT id_tag, nome from ".$esquemaadmin."i3geoadmin_tags order by lower(nome)", $dbh, false );
 		if ($dados === false) {
diff --git a/admin1/cadastros/tags/index.js b/admin1/cadastros/tags/index.js
index 5ae25da..ca6993d 100755
--- a/admin1/cadastros/tags/index.js
+++ b/admin1/cadastros/tags/index.js
@@ -27,6 +27,8 @@ i3GEOadmin.tags = {
 		ondeLista: "",
 		//conteudo html do formulario de adicao de operacao
 		formAdiciona: "",
+		//parametros obtidos do formulario de edicao antes de abrir o modal de confirmacao
+		parametrosSalvar: "",
 		init: function(onde){
 			i3GEOadmin.tags.ondeLista = onde;
 			i3GEOadmin.tags.lista();
@@ -59,7 +61,7 @@ Obtém a lista de tags
 										{
 											"data": json,
 											"onExcluir": "i3GEOadmin.tags.excluirDialogo",//funcao
-											"onSalvar": "i3GEOadmin.tags.salvarDialogo"//funcao
+											"onEditar": "i3GEOadmin.tags.editarDialogo"//funcao
 										}
 								)
 						);
@@ -86,6 +88,7 @@ Obtém a lista de tags
 											i3GEOadmin.tags.dicionario,
 											{
 												"id_tag": "modal",
+												"nome": "",
 												"excluir": i3GEOadmin.tags.dicionario.cancelar,
 												"onExcluir": "i3GEOadmin.core.fechaModalGeral",//funcao
 												"onSalvar": "i3GEOadmin.tags.adiciona"//funcao
@@ -102,6 +105,38 @@ Obtém a lista de tags
 				i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
 			});
 		},
+		editarDialogo: function(id){
+			i3GEOadmin.core.fechaModalGeral();
+			i3GEOadmin.core.modalAguarde(true);
+			$.post(
+					"exec.php?funcao=listaunico",
+					"id_tag=" + id
+			)
+			.done(
+					function(data, status){
+						var json = jQuery.parseJSON(data);
+						var html = Mustache.to_html(
+								"{{#data}}" + $("#templateFormLista").html() + "{{/data}}",
+								$.extend(
+										{},
+										i3GEOadmin.tags.dicionario,
+										{
+											"data": json,
+											"onExcluir": "i3GEOadmin.tags.excluirDialogo",//funcao
+											"onSalvar": "i3GEOadmin.tags.salvarDialogo"//funcao
+										}
+								)
+						);
+						i3GEOadmin.core.abreModalGeral(html);
+					}
+			)
+			.fail(
+					function(data){
+						i3GEOadmin.core.modalAguarde(false);
+						i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
+					}
+			);
+		},
 		adicionaDialogo: function(){
 			i3GEOadmin.core.abreModalGeral(i3GEOadmin.tags.formAdiciona);
 		},
@@ -159,17 +194,18 @@ Obtém a lista de tags
 			);
 		},
 		salvarDialogo: function(id){
+			i3GEOadmin.tags.parametrosSalvar = $("#form-edicao-" + id).serialize();
 			var hash = {
 					"mensagem": i3GEOadmin.tags.dicionario.confirma,
 					"onBotao1": "i3GEOadmin.tags.salvar('"+id+"')",
 					"botao1": i3GEOadmin.tags.dicionario.sim,
-					"onBotao2": "i3GEOadmin.core.fechaModalConfirma();",
+					"onBotao2": "i3GEOadmin.tags.parametrosSalvar = '';i3GEOadmin.core.fechaModalConfirma();",
 					"botao2": i3GEOadmin.tags.dicionario.nao
 			};
 			i3GEOadmin.core.abreModalConfirma(hash);
 		},
 		salvar: function(id){
-			var parametros = $("#form-" + id + " form").serialize();
+			var parametros = i3GEOadmin.tags.parametrosSalvar;
 			i3GEOadmin.core.fechaModalGeral();
 			i3GEOadmin.core.modalAguarde(true);
 			$.post(
@@ -178,6 +214,7 @@ Obtém a lista de tags
 			)
 			.done(
 					function(data, status){
+						i3GEOadmin.tags.parametrosSalvar = "";
 						i3GEOadmin.core.modalAguarde(false);
 						i3GEOadmin.core.iconeAguarde(i3GEOadmin.tags.ondeLista);
 						i3GEOadmin.tags.lista();
@@ -185,6 +222,7 @@ Obtém a lista de tags
 			)
 			.fail(
 					function(data){
+						i3GEOadmin.tags.parametrosSalvar = "";
 						i3GEOadmin.core.modalAguarde(false);
 						i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
 					}
diff --git a/admin1/cadastros/tags/index.php b/admin1/cadastros/tags/index.php
index 9b03b27..1a3479c 100755
--- a/admin1/cadastros/tags/index.php
+++ b/admin1/cadastros/tags/index.php
@@ -17,8 +17,8 @@ include "../../head.php";
 
 <div class="container">
 	<div class="row center-block">
-		<div class="col-md-12">
-			<div class="well hidden" id="titulo">
+		<div class="col-md-12" id="titulo">
+			<div class="well hidden" >
 				<!--
 				<button data-toggle="modal" data-target="#ajudaPrincipal"
 					class="btn btn-primary btn-fab btn-fab-mini pull-right">
@@ -33,11 +33,6 @@ include "../../head.php";
 						title="{{{filtro}}}" onchange="i3GEOadmin.core.filtra(this)" id="filtro" class="form-control input-lg">
 					</select>
 				</div>
-				<div class="row pull-right">
-					<a onclick="i3GEOadmin.tags.adicionaDialogo();" href="javascript:void(0)"
-						class="btn btn-primary" role="button" style="color:#008579;">{{{adicionar}}}</a>
-				</div>
-				<div class="clearfix"></div>
 				<!--
 				<div id="ajudaPrincipal" class="modal fade" tabindex="-1">
 					<div class="modal-dialog">
@@ -51,6 +46,11 @@ include "../../head.php";
 				-->
 			</div>
 			<div class="well hidden">
+				<div class="row pull-right">
+					<a onclick="i3GEOadmin.tags.adicionaDialogo();" href="javascript:void(0)"
+						class="btn btn-primary" role="button" style="color:#008579;">{{{adicionar}}}</a>
+				</div>
+				<div class="clearfix"></div>
 				<div id="corpo"></div>
 			</div>
 		</div>
@@ -60,35 +60,41 @@ include "../../head.php";
 <option value="form-{{id_tag}}">{{{nome}}}</option>
 </script>
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form style="" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
+<form id="form-edicao-{{id_tag}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tag}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
 	method="post"  >
-	<div class="form-group form-group-lg">
-		<label class="col-md-2 control-label" for="nome">Tag</label>
-		<div class="col-md-10">
-			<input title="Tag" type="text" value="{{{nome}}}" class="form-control" name="nome" required>
+	<div class="row">
+		<div class="col-md-12">
+			<h4>Tag</h4>
+			<div class="form-group form-group-lg">
+				<label class="col-md-2 control-label" for="nome" >{{{nome}}}</label>
+				<div class="col-md-10">
+					<input title="{{{nome}}}" type="text" value="{{{nome}}}" class="form-control" name="nome" required>
+				</div>
+			</div>
 		</div>
 	</div>
 	<div class="pull-right">
-		<a href="javascript:void(0)" onclick="{{onExcluir}}('{{id_tag}}')" class="btn btn-danger"
-			style="color:#e13023;" role="button">{{excluir}}</a>
-		<a href="javascript:void(0)"
-			onclick="{{onSalvar}}('{{id_tag}}')" class="btn btn-primary" role="button" style="color:#008579;">{{salvar}}</a>
+		<button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{salvar}}</button>
 	</div>
 	<div class="clearfix"></div>
 </form>
 </script>
 <script id="templateLista" type="x-tmpl-mustache">
-	<div class="panel panel-default" id="form-{{id_tag}}">
-		<div class="panel-body">
-			<div class="row">
-				<div class="col-md-12">
-					{{{templateFormLista}}}
-
-				</div>
-			</div>
-		</div>
+<div class="list-group-item" id="form-{{id_tag}}">
+	<div class="row-content">
+		<h3 class="list-group-item-heading {{escondido}}">
+			{{{nome}}}
+			<a href="javascript:void(0)" onclick="{{onEditar}}('{{id_tag}}')" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
+				<i class="material-icons md-18">edit</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+			<a href="javascript:void(0)" onclick="{{onExcluir}}('{{id_tag}}')" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
+				<i class="material-icons md-18">delete_forever</i>
+			</a>
+		</h3>
 	</div>
-</script>
+	<div class="list-group-separator"></div>
+</div></script>
 
 <script type="text/javascript" src="index.js"></script>
 <script type="text/javascript" src="../../dicionario/tags.js"></script>
--
libgit2 0.21.2