diff --git a/chromebook-checkout-meteor/client/admin.css b/chromebook-checkout-meteor/client/admin.css
new file mode 100644
index 0000000..9dbe7bd
--- /dev/null
+++ b/chromebook-checkout-meteor/client/admin.css
@@ -0,0 +1,66 @@
+<<<<<<< HEAD
+.overlap-fix {
+  margin-left:100px;
+  margin-top: 16px;
+} 
+.yield:hover {
+  color: #E14C2B;
+}
+.row-admin {
+  max-width:89%;
+}
+.submission {
+  margin-left: 2%;
+  height: 30px;
+  width: 95%;
+  margin-top: 0%;
+  font-size: 14pt;
+}
+.add {
+  background: #d94158;
+  background-image: -webkit-linear-gradient(top, #d94158, #ad3838);
+  background-image: -moz-linear-gradient(top, #d94158, #ad3838);
+  background-image: -ms-linear-gradient(top, #d94158, #ad3838);
+  background-image: -o-linear-gradient(top, #d94158, #ad3838);
+  background-image: linear-gradient(to bottom, #d94158, #ad3838);
+  border-radius: 9px;
+  outline: 0;
+  color: #ffffff;
+  padding: .5% 0%;
+  margin-left: 1.5%;
+  margin-right: 1.5%;
+  width: 97%;
+  font-size: 18pt;
+}
+.add:hover {
+  background: #db6b6b;
+  background-image: -webkit-linear-gradient(top, #db6b6b, #d64949);
+  background-image: -moz-linear-gradient(top, #db6b6b, #d64949);
+  background-image: -ms-linear-gradient(top, #db6b6b, #d64949);
+  background-image: -o-linear-gradient(top, #db6b6b, #d64949);
+  background-image: linear-gradient(to bottom, #db6b6b, #d64949);
+  text-decoration: none;
+}
+.border {
+  padding: 1% 15px 1% 15px;
+  overflow:auto;
+  max-height:550px;
+  min-width:700px;
+ }
+=======
+.remove {
+  margin-bottom: 4%;
+}
+
+.yield:hover {
+  color: #E14C2B;
+}
+
+.row {
+  min-width: 80%;
+}
+#edit-admin {
+  max-height:350px;
+  overflow:auto;
+}
+>>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
diff --git a/chromebook-checkout-meteor/client/admin.html b/chromebook-checkout-meteor/client/admin.html
new file mode 100644
index 0000000..8717c56
--- /dev/null
+++ b/chromebook-checkout-meteor/client/admin.html
@@ -0,0 +1,65 @@
+<template name="admin">
+  <div class="main-center-admin">
+    <div>
+    <h5>Admin Panel</h5>
+    </div>
+    
+          {{#teacherTabs tabs=tabs}}
+          <!-- Single -->
+      <div class="border">
+      <div>
+<<<<<<< HEAD
+        <h6>Edit Chromebooks</h6> <!-- Edit Chromebooks -->
+=======
+      <div class="Adding">
+        <h6>Add a Chromebook</h6>
+        <form class="new-task">
+          <input type="text" name="anumber" placeholder="Chromebook Number (eg. B1)" />
+          <input type="text" name="aserial" placeholder="Serial Number (eg. ABCD1234)" />
+          <input type="submit" value="Submit" class="add" />
+        </form>
+      </div>
+      <div>
+        <h6>Edit Chromebooks</h6>
+>>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
+        {{#each chromebooks}}
+          <div class="row-admin">
+            {{> chromebook}}
+            <i class="icons yield fa fa-exclamation-triangle fa-lg"></i>
+            <div class="overlap-fix">
+            <i class="icons cross fa fa-times fa-lg"></i>
+          </div> 
+      </div> 
+      {{/each}}
+        <h6>Add a Chromebook</h6> <!-- Add Chromebooks -->
+        <form class="new-task">
+          <input type="text" name="anumber" placeholder="Chromebook Number (eg. B1)" class="submission" />
+          <input type="text" name="aserial" placeholder="Serial Number (eg. ABCD1234)" class="submission"/>
+          <input type="submit" value="Submit" class="add" />
+        </form>
+    </div>
+    </div>
+          <!-- Carts -->
+      <div class="border">
+      <div>
+        <h6> Edit Carts</h6> <!-- Editing Carts -->
+        {{#each carts}}
+        <div class="row-admin">
+          {{>cart}}
+          <i class="icons yieldc fa fa-exclamation-triangle fa-lg"></i>
+          <div class="overlap-fix">
+          <i class="icons crossc fa fa-times fa-lg"></i>
+        </div>
+       </div>
+       {{/each}}
+      <h6>Add a Cart</h6> <!-- Adding Carts -->
+        <form class="new-task">
+          <input type="text" name="acnumber" placeholder="Cart Number (ex. A)" class="submission"/>
+          <input type="submit" value="Submit" class="add" />
+        </form>
+    </div>
+    </div>
+        {{/teacherTabs}}
+    
+  </div>
+</template> 
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/main.css b/chromebook-checkout-meteor/client/main.css
new file mode 100644
index 0000000..7497fcb
--- /dev/null
+++ b/chromebook-checkout-meteor/client/main.css
@@ -0,0 +1,181 @@
+/* Global HTML Defaults */
+@font-face {
+  font-family: 'Lato';
+  src: url('fonts/Lato-Light.woff');
+}
+html { 
+  background: url("images/bg.jpg") no-repeat center center fixed; 
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+}
+body {
+  font:35px/1.5 'Lato';
+  color:#777;
+  font-weight:300;
+  height:100%;
+  overflow:hidden;
+  width: 100%;
+  margin: 0;
+}
+h5 {
+  margin-top:0.3%;
+  margin-bottom:0.3%;
+  color:#777;
+  font-weight:10;
+  padding-top:3%;
+  text-align: center;
+}
+h6 {
+  margin:0;
+  padding:1% 10% 0% 0%;
+  padding-left:3.6%;
+}
+/* End */
+
+/* Center Boxes -- All HTML Files */
+.initial {
+  margin-top:24.5%;
+  max-width:600px;
+}
+.main-center, .main-center-admin, .initial {
+  background-color: #F7F7FF;
+  border-radius:15px;
+  margin-left:auto;
+  margin-right:auto;
+  margin-bottom:0;
+
+  height:auto;
+  box-shadow: 0px 5px 10px #222222;
+}
+.main-center, .main-center-admin {
+  max-height:700px;
+  margin-top:4%;
+}
+.main-center {
+  max-width:825px;
+}
+<<<<<<< HEAD
+.main-center-admin {
+  max-width:900px;
+}
+/* End */ 
+
+/* Chromebook Content */
+.chromebooks, .chckChromebooks, .tchChromebooks {
+  overflow: auto;
+  padding-top:.5%;
+  padding-bottom:.5%;
+=======
+#chromebooks, #carts, .tchromebooks {
+  overflow: auto;
+  padding-top:.5%;
+  padding-bottom:.5%;
+}
+#chromebooks, #carts {
+  max-height:600px;
+}
+.tchromebooks {
+  max-height:500px;
+}
+#border {
+  padding: 0 15px 15px 15px;
+>>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
+}
+.row, .row-admin {
+  height: 10%;
+  display: flex;
+}
+<<<<<<< HEAD
+/* End */
+=======
+.row-admin {
+  max-width:89%;
+}
+#overlap-fix {
+  margin-left:100px;
+  margin-top: 16px;
+}
+  
+.tabs {
+  margin-top: 0;
+  padding-top: 0;
+}
+
+input {
+	margin-left:5%;
+	height:3%;
+	width:89%;
+	font:20px/1.5 'Lato';
+	margin-top:0%
+}
+#footer {
+  position:absolute;
+	bottom:0%;
+  right:1%;
+ 
+}
+
+//Paragraphs
+p {
+  padding-left:0px;
+}
+p.bottom {
+	padding-top:0%;
+  margin-left:37.5%;
+  margin-right:auto;
+	color:#f7f7f7;
+  max-width:325px;
+  font:27px 'Lato';
+}
+
+.bottom {
+  display: inline;
+}
+
+p.footer {
+	color:#f7f7f7
+}
+
+//Headers
+h1 {
+  font-size:28px;
+}
+h2 {
+  color:#393939;
+}
+h3 {
+padding-bottom:10px;
+}
+h5{
+  margin-top:0.3%;
+  margin-bottom:0.3%;
+  color:#777;
+  font-weight:10;
+  padding-top:3%;
+  text-align: center;
+}
+h6{
+	margin:0;
+	padding:1% 10% 0% 0%;
+	padding-left:3.6%;
+}
+@-webkit-keyframes neon1 {
+  from {
+    text-shadow: 0 0 5px #9f9f9f,
+               0 0 20px  #d5d5d5,
+               0 0 30px  #d5d5d5,
+               0 0 35px  #f9f9f9,
+               0 0 40px  #f9f9f9;
+  }
+  to {
+    text-shadow: 0 0 3px #9f9f9f,
+               0 0 10px #d5d5d5,
+               0 0 15px #d5d5d5,
+               0 0 17px #f9f9f9,
+               0 0 20px #f9f9f9,
+               0 0 20px #f9f9f9;
+  }
+}
+>>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
diff --git a/chromebook-checkout-meteor/client/tabs.css b/chromebook-checkout-meteor/client/tabs.css
new file mode 100644
index 0000000..f719f89
--- /dev/null
+++ b/chromebook-checkout-meteor/client/tabs.css
@@ -0,0 +1,36 @@
+.tabs-list {
+  text-align: center;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+}
+.tab-item {
+  font-weight: 600;
+  font-size: 13px;
+  float: left;
+  padding: 13px 23.02%;
+  margin: 0;
+  list-style: none;
+  cursor: pointer;
+}
+.tab-item.active {
+  border-radius: top 5px;
+  border: 1px solid #ddd;
+  border-bottom: none;
+  margin-bottom: -1px !important;
+  padding: 13px 23.03% 14px 23.02% !important;
+  background-color: #fff;
+  color: #333;
+}
+.tabs-content-container {
+  padding: 4.2% 15px 15px 15px;
+<<<<<<< HEAD
+=======
+}
+
+.tabs-content {
+overflow: scroll;
+min-width: 500px;
+max-height: 500px;
+>>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
+}
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/teacher.html b/chromebook-checkout-meteor/client/teacher.html
new file mode 100644
index 0000000..8b069fa
--- /dev/null
+++ b/chromebook-checkout-meteor/client/teacher.html
@@ -0,0 +1,33 @@
+<template name="teacher">
+    <div class="main-center">
+      <div>
+      <h5>Chromebook Checkout</h5>
+      </div>
+              {{#teacherTabs tabs=tabs}}
+          <!-- Single -->
+<<<<<<< HEAD
+          <div class="tchChromebooks">
+            <div>
+=======
+           <div>
+>>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
+              {{#each chromebooks}}
+                <div class="row">
+                  {{> chromebook}}
+                </div>
+              {{/each}}
+            </div>
+          </div>
+          <!-- Carts -->
+          <div class="tchChromebooks">
+            <div>
+            {{#each carts}}
+              <div class="row">
+                {{>cart}}
+              </div>
+            {{/each}}
+          </div>
+          </div>
+               {{/teacherTabs}}
+        </div>
+</template>
\ No newline at end of file