diff --git a/punch_list/backlog.html b/punch_list/backlog.html
deleted file mode 100644
index ba00ee7..0000000
--- a/punch_list/backlog.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<!--  <link rel="stylesheet" type="text/css" href="style.css"> -->
-		<!-- No Cache -->
-		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
-		<meta http-equiv="Pragma" content="no-cache">
-		<meta http-equiv="Expires" content="0">
-		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-		<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
-		<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-		<script src="metadata.js"></script>
-		<script src="backlogManage.js"></script>
-		<script src="js/datepicker.min.js"></script>
-		<script src="js/i18n/datepicker.en.js"></script>
-		<script src="https://apis.google.com/js/platform.js" async defer></script>
-		<!-- Font -->
-		<link href='https://fonts.googleapis.com/css?family=Raleway:400,300,600' rel='stylesheet' type='text/css'>
-		<link rel="stylesheet" type="text/css" href="css/datepicker.min.css">
-		<!-- CSS -->
-		<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-		<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
-		<link rel="stylesheet" href="css/normalize.css">
-		<link rel="stylesheet" href="css/skeleton.css">
-		<link rel="stylesheet" href="css/custom.css">
-	</head>
-
-	<body>
-		<div class="dropdown u-pull-right" id=mainMenuWrapper>
-			<button class="top dropbtn" onclick=mainMenuDrop() id=mainMenu>Menu</button>
-			<div id=mainMenuDropdown class="dropdown-content punch-default">
-				<a href="#" onclick="genEventForm()">New Punch Item</a>
-				<a href="#" onclick="genDaily()">Generate Daily Punches</a>
-				<a href="#" onclick="genWeekly()">Generate Weekly Punches</a>
-				<a href="#" onclick="getJson(genList)">Refresh</a>
-				<a href="https://thelinux.pro/broadcast_timer">Broadcast Timer</a>
-			</div>
-		</div>
-
-	<!-- // Old Menu Buttons
-		<div class="container">
-			<button class="button" onClick="genEventForm()" id="put">New Punch Item</button>
-			<button class="button" onClick="genDaily()" id="daily">Gen Daily</button>
-			<button class="button" onClick="genWeekly()" id="daily">Gen Weekly</button>
-			<button class="button" onClick="getJson(genList)" id="getJson">Refresh</button>
-			<a class="button" href="https://thelinux.pro/broadcast_timer">Time Boxer</a>
-		</div>
-	-->
-
-		<div id=container>
-		<div id=left class="column-left">
-			<div class="eight columns"> &nbsp; </div>
-			<div class="four columns subject" style="border-bottom: 2px solid #fff">STATS</div>
-			<div class="eight columns"> &nbsp; </div>
-			<div id=stats class="four columns"></div>
-		</div>
-
-		<div id=middle class="column-middle">
-
-			<div id="editPunch" class="listWrapper"></div>
-
-			<div class="listWrapper" id="punchListAll">
-				<div id="punchListInProgressWrapper" class="listWrapper">
-					<span class="punchListHeader">Backlog</span>
-					<div id="punchListBacklog"></div>
-				</div>
-			</div>
-
-			<div class="container row" id="newEvent">
-				<input onfocus="clearDefault(this)" class="u-full-width" type="text" id="newSubject" value="subject">
-				<input onfocus="clearDefault(this)" class="u-full-width" type="text" id="newPriority" value="priority">
-				<input type="hidden" id="newProgress" value="new">
-				<input onfocus="clearDefault(this)" type="text" id="timepickerCreate" class="datepicker-here u-full-width" data-timepicker="true" data-language="en" value="date">
-				Notes:<br />
-				<textarea class="u-full-width" id="newNotes" value=""></textarea>
-				<input class="u-full-width" onClick="createNewEvent()" id="test" type="button" value="Create" />
-				<input class="u-full-width" onClick="disableElement('newEvent'),enableElement('punchListAll')" id="nevermind" type="button" value="Nevermind." />
-			</div>
-
-
-			<div class='u-pull-right' style="width: 200px;">
-				<div style="width: 100%;" class='punch-default u-pull-right'><a class='punch-default u-pull-right' href='#' onClick=clearTagFilter()>Clear Tags</a></div>
-				<div style="width: 100%;" class='punch-default u-pull-right' id=versionInfo></div>
-			</div>
-			<div id="debug1"></div>
-
-		</div>
-
-		<div id=right class="column-right">
-			<div class="twelve columns"> and things </div>
-		</div>
-		</div>
-	</body>
-</html>
diff --git a/punch_list/index.html b/punch_list/index.html
index ead4f8a..ba00ee7 100644
--- a/punch_list/index.html
+++ b/punch_list/index.html
@@ -2,92 +2,94 @@
 <html lang="en">
 	<head>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<!-- Font -->
-	<!--	<link href='http://fonts.googleapis.com/css?family=Raleway:400,300,600' rel='stylesheet' type='text/css'> -->
-		<!-- CSS -->
-		<link rel="stylesheet" href="css/normalize.css">
-		<link rel="stylesheet" href="css/skeleton.css">
-		<link rel="stylesheet" href="css/custom.css">
-		<link href="css/datepicker.min.css" rel="stylesheet" type="text/css">
 		<!--  <link rel="stylesheet" type="text/css" href="style.css"> -->
 		<!-- No Cache -->
 		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
 		<meta http-equiv="Pragma" content="no-cache">
 		<meta http-equiv="Expires" content="0">
-		<meta name="google-signin-client_id" content="999467953896-gku66r62t0sbodkroiqre0g43l8teal1.apps.googleusercontent.com">
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+		<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+		<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 		<script src="metadata.js"></script>
-		<script src="eventManage.js"></script>
-		<script src="timePicker.js"></script>
+		<script src="backlogManage.js"></script>
 		<script src="js/datepicker.min.js"></script>
-		<!-- Include English language -->
 		<script src="js/i18n/datepicker.en.js"></script>
 		<script src="https://apis.google.com/js/platform.js" async defer></script>
-
+		<!-- Font -->
+		<link href='https://fonts.googleapis.com/css?family=Raleway:400,300,600' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" type="text/css" href="css/datepicker.min.css">
+		<!-- CSS -->
+		<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+		<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/skeleton.css">
+		<link rel="stylesheet" href="css/custom.css">
 	</head>
 
 	<body>
-		<div class="container">
-			<div class="g-signin2 u-pull-right" data-onsuccess="onSignIn"></div>
-			<div class="u-pull-right" id="signOut"><a href="#" onclick="signOut();">Sign out</a></div>
-
+		<div class="dropdown u-pull-right" id=mainMenuWrapper>
+			<button class="top dropbtn" onclick=mainMenuDrop() id=mainMenu>Menu</button>
+			<div id=mainMenuDropdown class="dropdown-content punch-default">
+				<a href="#" onclick="genEventForm()">New Punch Item</a>
+				<a href="#" onclick="genDaily()">Generate Daily Punches</a>
+				<a href="#" onclick="genWeekly()">Generate Weekly Punches</a>
+				<a href="#" onclick="getJson(genList)">Refresh</a>
+				<a href="https://thelinux.pro/broadcast_timer">Broadcast Timer</a>
+			</div>
 		</div>
 
+	<!-- // Old Menu Buttons
 		<div class="container">
-			<button class="button" onClick="disableElement('punchListAll'), disableElement('punchDetail'), enableElement('newEvent')" id="put">New Punch Item</button>
+			<button class="button" onClick="genEventForm()" id="put">New Punch Item</button>
 			<button class="button" onClick="genDaily()" id="daily">Gen Daily</button>
 			<button class="button" onClick="genWeekly()" id="daily">Gen Weekly</button>
 			<button class="button" onClick="getJson(genList)" id="getJson">Refresh</button>
 			<a class="button" href="https://thelinux.pro/broadcast_timer">Time Boxer</a>
 		</div>
+	-->
 
-		<div class="row" id="editPunch">
-				<input type=hidden id=editID>
-
-				<input class="u-full-width" type="text" id="editSubject" value=""><br />
-				<input class="u-full-width" type="text" id="editPriority" value=""><br />
-				<input class="u-full-width" type="text" id="editProgress" READONLY><br />
-				<input type='text' id='timepickerEdit' class='datepicker-here u-full-width' data-timepicker='true' data-language='en'><br />
-				<!-- <input type="text" id="editStartDate" value=""> -->
-				<textarea class="u-full-width" id="editNotes" value=""></textarea>
-				<input onfocus="clearDefault(this)" type='text' id='tag' value="new Tag"><input onClick="addTag()" type=button value="ADD" />
-				<input class="u-full-width" onClick="submitEditPunch()" id="test" type="button" value="Update" />
-		</div>
-		<div class="container row" id="newEvent">
-				<form id="newEventForm" onSubmit="return processEventForm(this.form)">
-					<input onfocus="clearDefault(this)" class="u-full-width" type="text" id="newSubject" value="subject">
-					<input onfocus="clearDefault(this)" class="u-full-width" type="text" id="newPriority" value="priority">
-					<input type="hidden" id="newProgress" value="new">
-					<input onfocus="clearDefault(this)" type='text' id='timepickerCreate' class='datepicker-here u-full-width' data-timepicker='true' data-language='en' value="date">
-					<textarea class="u-full-width" id="newNotes" value="Notes"></textarea>
-					<input class="u-full-width" onClick="createNewEvent()" id="test" type="button" value="Update" />
-				</form>
+		<div id=container>
+		<div id=left class="column-left">
+			<div class="eight columns"> &nbsp; </div>
+			<div class="four columns subject" style="border-bottom: 2px solid #fff">STATS</div>
+			<div class="eight columns"> &nbsp; </div>
+			<div id=stats class="four columns"></div>
 		</div>
 
-		<div class="listWrapper" id="punchListAll">
-			<div id="punchListInProgressWrapper" class="listWrapper">
-			<span class="punchListHeader">In Progress</span>
-				<div id="punchListInProgress"></div>
+		<div id=middle class="column-middle">
+
+			<div id="editPunch" class="listWrapper"></div>
+
+			<div class="listWrapper" id="punchListAll">
+				<div id="punchListInProgressWrapper" class="listWrapper">
+					<span class="punchListHeader">Backlog</span>
+					<div id="punchListBacklog"></div>
+				</div>
 			</div>
 
-			<div id="punchListNewWrapper" class="listWrapper">
-			<span class="punchListHeader">New</span>
-				<div id="punchListNew"></div>
+			<div class="container row" id="newEvent">
+				<input onfocus="clearDefault(this)" class="u-full-width" type="text" id="newSubject" value="subject">
+				<input onfocus="clearDefault(this)" class="u-full-width" type="text" id="newPriority" value="priority">
+				<input type="hidden" id="newProgress" value="new">
+				<input onfocus="clearDefault(this)" type="text" id="timepickerCreate" class="datepicker-here u-full-width" data-timepicker="true" data-language="en" value="date">
+				Notes:<br />
+				<textarea class="u-full-width" id="newNotes" value=""></textarea>
+				<input class="u-full-width" onClick="createNewEvent()" id="test" type="button" value="Create" />
+				<input class="u-full-width" onClick="disableElement('newEvent'),enableElement('punchListAll')" id="nevermind" type="button" value="Nevermind." />
 			</div>
 
-			<div id="punchListDoneWrapper" class="listWrapper">
-			<span class="punchListHeader">Done</span>
-				<div id="punchListDone"></div>
+
+			<div class='u-pull-right' style="width: 200px;">
+				<div style="width: 100%;" class='punch-default u-pull-right'><a class='punch-default u-pull-right' href='#' onClick=clearTagFilter()>Clear Tags</a></div>
+				<div style="width: 100%;" class='punch-default u-pull-right' id=versionInfo></div>
 			</div>
+			<div id="debug1"></div>
+
 		</div>
 
-		<div id="punchDetail"></div>
-
-
-
-		<p id="result"></p>
-		<div id="clearTags" class="grid-meta u-pull-right"><a href="#" onClick="clearTagFilter()">Clear Tags</a></div><br />
-		<div id="showDone" class="grid-meta u-pull-right"></div><br />
-		<div id="meta" class="grid-meta u-pull-right"></div>
+		<div id=right class="column-right">
+			<div class="twelve columns"> and things </div>
+		</div>
+		</div>
 	</body>
 </html>
