diff --git a/assets/templates/components/pins_popover.html.ep b/assets/templates/components/pins_popover.html.ep
index ebedd77..0c7ad6b 100644
--- a/assets/templates/components/pins_popover.html.ep
+++ b/assets/templates/components/pins_popover.html.ep
@@ -9,7 +9,7 @@
 				<tr class="pin" id="<%= $_->pinid %>">
 					<td class="pin-pin"><%= $_->pin %></td>
 					<td class="pin-type"><%= $_->type %></td>
-					<td><a href="#" class="delete-pin"><span class="glyphicon glyphicon-trash"></span></a></td>
+					<td><a href="#" class="delete-pin" data-type="pin"><span class="glyphicon glyphicon-trash"></span></a></td>
 				</tr>
 				% }
 			</tbody>
@@ -17,6 +17,7 @@
 		<div class="form-data-body col-sm-12 hide">
 			<div class="form-wrapper">
 				<form class="form-horizontal add-pin-form" role="form" data-gpioid="<%= $gpioid %>">
+					<input name="new-gpioid" type="hidden" value="<%= $gpioid %>">
 					<div class="form-group">
 						<label for="new-pin" class="col-sm-2 control-label">Pin</label>
 						<div class="col-sm-10">
@@ -24,9 +25,9 @@
 						</div>
 					</div>
 					<div class="form-group">
-						<label for="new-pin-type" class="col-sm-2 control-label">Type</label>
+						<label for="new-type" class="col-sm-2 control-label">Type</label>
 						<div class="col-sm-10">
-							<select class="form-control" name="new-pin-type">
+							<select class="form-control" name="new-type">
 								% my @gpio_types=@{stash("gpio_types")} if (defined stash("gpio_types"));
 								% if (scalar @gpio_types > 0){
 								%   foreach (@gpio_types) {
@@ -43,7 +44,7 @@
 				<span class="glyphicon glyphicon-remove"></span>
 				<span>Close</span>
 				</button>
-				<button type="button" class="btn btn-primary modal-add is-popover" data-action="add-pin">
+				<button type="button" class="btn btn-primary modal-add is-popover" data-action="add_pin">
 				<i id="add-tag-spinner"></i>
 				<span>Add Pin</span>
 				</button>
diff --git a/assets/templates/components/tags_popover.html.ep b/assets/templates/components/tags_popover.html.ep
index 0fb6f62..4bca487 100644
--- a/assets/templates/components/tags_popover.html.ep
+++ b/assets/templates/components/tags_popover.html.ep
@@ -17,6 +17,7 @@
 		<div class="form-data-body col-sm-12 hide">
 			<div class="form-wrapper">
 				<form class="form-horizontal add-tag-form" role="form" data-gpioid="<%= $gpioid %>">
+					<input name="new-gpioid" type="hidden" value="<%= $gpioid %>">
 					<div class="form-group">
 						<div class="col-sm-12">
 							<input type="text" name="new-tag" placeholder="Tag Name (ex.: bedroom)" class="form-control" id="new-tag">
@@ -24,7 +25,7 @@
 					</div>
 					<div class="form-group">
 						<div class="col-sm-12">
-							<input type="text" name="new-tag-description" placeholder="Tag Description" class="form-control" id="new-tag-description">
+							<input type="text" name="new-description" placeholder="Tag Description" class="form-control" id="new-tag-description">
 						</div>
 					</div>
 				</form>
@@ -34,7 +35,7 @@
 				<span class="glyphicon glyphicon-remove"></span>
 				<span>Close</span>
 				</button>
-				<button type="button" class="btn btn-primary modal-add is-popover" data-action="add-tag">
+				<button type="button" class="btn btn-primary modal-add is-popover" data-action="add_tag">
 				<i id="add-tag-spinner"></i>
 				<span>Add Tag</span>
 				</button>