diff --git a/src/css/skynet.css b/src/css/skynet.css
index f62d20f..8d55e49 100644
--- a/src/css/skynet.css
+++ b/src/css/skynet.css
@@ -47,8 +47,8 @@ body {
 #search input.image {
 	position: absolute;
 	height: 25px;
-	top: 0px;
-	left: 0px;
+	top: 0;
+	left: 0;
 }
 
 #search input.text{
@@ -83,7 +83,7 @@ body {
 	text-align: center;
 	background-image: url(../images/sub1.jpg);
 	height: 24px;
-	margin: 0px;
+	margin: 0;
 	color: #585B5F;
 	background-repeat: no-repeat;
 	padding-top: 8px;
@@ -92,8 +92,8 @@ body {
 
 #news ul{
 	list-style-type: none;
-	margin: 0px;
-	padding: 5px 0px 1px;
+	margin: 0;
+	padding: 5px 0 1px;
 	border-left-width: 1px;
 	border-left-style: solid;
 	border-right-width: 1px;
@@ -150,7 +150,7 @@ body {
 #subnav ul {
 	margin: 0;
 	list-style-type: none;
-	padding: 0px;
+	padding: 0;
 }
 
 #subnav li {
@@ -274,15 +274,15 @@ body {
 
 #maincenter h2{
   font-size: 1.1em;
-  margin: 0px;
+  margin: 0;
   padding-bottom: 5px;
 }
 
 #maincenter h3{
   font-size: 1em;
   font-weight: bold;
-  margin: 0px;
-  padding-bottom: 0px;
+  margin: 0;
+  padding-bottom: 0;
 }
 
 #maincenter p{
@@ -338,13 +338,12 @@ a:hover {
 }
 
 table input {
-  border: 1px;
-  border-style:solid;
-  background:#f0f0f0;
+	border: 1px solid;
+	background:#f0f0f0;
   font-size: 10pt;
-  font-family: arial, verdana;
+	font-family: arial, verdana, serif;
   color: #000000;
- margin-bottom: 0px;
+ margin-bottom: 0;
 }
 
 #drop {
@@ -358,13 +357,13 @@ table input {
 	list-style: none;
 	float: left;
 	padding-right: 1px;
-	padding-left: 0px;
+	padding-left: 0;
 	text-align: center;
 }
 #drop ul {
 	list-style-type: none;
 	margin: 0;
-	padding: 0px;
+	padding: 0;
 }
 
 #drop li a.top {
@@ -409,7 +408,7 @@ table input {
 	display: none; 
 	width: 7em; 		/* Width to help Opera out */
 	background-color: #CCCCFF;  
-	margin: 31px 0 0 0px;
+	margin: 31px 0 0 0;
 	border: 2px solid #000;
 	padding: 1px 1px 3px 2px;
 }
diff --git a/src/index.html b/src/index.html
index 9604cbc..cf8ea15 100644
--- a/src/index.html
+++ b/src/index.html
@@ -56,7 +56,8 @@
 	<!-- FB JS -->
 	<div id="fb-root"></div>
 	<script>(function(d, s, id) {
-	  var js, fjs = d.getElementsByTagName(s)[0];
+      let js;
+      const fjs = d.getElementsByTagName(s)[0];
 	  if (d.getElementById(id)) return;
 	  js = d.createElement(s); js.id = id;
 	  js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.10";
@@ -72,8 +73,8 @@
 
 <script>
             $(document).ready(function() {
-              var owl = $('.owl-carousel');
-              owl.owlCarousel({
+                const owl = $('.owl-carousel');
+                owl.owlCarousel({
                 items: 3,
                 loop: true,
                 margin: 50,
@@ -162,7 +163,7 @@
             <div class="row">
                 <div class="col-lg-8 col-lg-offset-2 text-center">
                     <h2 class="section-heading">CodeOff</h2>
-                    <a href="http://skynet.ie/codeoff/" class="btn btn-primary btn-xl sr-button">Click to Compete</a><br/>		    
+                    <a href="https://skynet.ie/codeoff/" class="btn btn-primary btn-xl sr-button">Click to Compete</a><br/>
                 </div>
             </div>
 	    <div class="row">
@@ -236,14 +237,14 @@
                     <div class="service-box">
 			<i class="fa fa-4x fa-comments text-primary sr-icons"></i>
                         <h3>Discord</h3>
-                        <p class="text-muted">We have an active discord server for our members to keep in touch. <a href="http://discord.skynet.ie">Join Here</a>.</p>
+                        <p class="text-muted">We have an active discord server for our members to keep in touch. <a href="https://discord.skynet.ie">Join Here</a>.</p>
                     </div>
                 </div>
                 <div class="col-lg-2 col-md-4 text-center">
                     <div class="service-box">
                         <i class="fa fa-4x fa-cubes text-primary sr-icons"></i>
                         <h3>Minecraft</h3>
-                        <p class="text-muted">We often host events and build challenges on our MineCraft server. <a href="http://games.skynet.ie">Join Here</a>.</p>
+                        <p class="text-muted">We often host events and build challenges on our MineCraft server. <a href="https://games.skynet.ie">Join Here</a>.</p>
                     </div>
                 </div>
                 <div class="col-lg-2 col-md-4 text-center">
@@ -414,7 +415,7 @@
                     <div class="service-box">
                         <i class="fa fa-4x fa-envelope-o text-primary sr-icons" style="color: white;"></i>
                         <h3>WebMail</h3>
-                        <!-- <p class="text-faded">Access your Skynet email <a href="http://webmail.skynet.ie/" style="color: white;">here</a></p> -->
+                        <!-- <p class="text-faded">Access your Skynet email <a href=" https://webmail.skynet.ie/" style="color: white;">here</a></p> -->
                     </div>
                 </div>
                 <div class="col-lg-3 col-md-4 text-center">
@@ -428,14 +429,14 @@
                     <div class="service-box">
                         <i class="fa fa-4x fa-question text-primary sr-icons" style="color: white;"></i>
                         <h3>User Guide</h3>
-                        <!-- <p class="text-faded">Answers to a lot of your questions about Skynet answered <a href="http://skynet.ie/guide/" style="color: white;">here</a></p> -->
+                        <!-- <p class="text-faded">Answers to a lot of your questions about Skynet answered <a href=" https://skynet.ie/guide/" style="color: white;">here</a></p> -->
                     </div>
                 </div>
                 <div class="col-lg-3 col-md-4 text-center">
                     <div class="service-box">
                         <i class="fa fa-4x fa-info text-primary sr-icons" style="color: white;"></i>
                         <h3>Wiki</h3>
-                        <!-- <p class="text-faded">Skynet Wiki available <a href="http://wiki.skynet.ie" style="color: white;">here</a></p> -->
+                        <!-- <p class="text-faded">Skynet Wiki available <a href=" https://wiki.skynet.ie" style="color: white;">here</a></p> -->
                     </div>
                 </div>
             </div>
@@ -582,16 +583,16 @@
                     <p>If you have a question you can contact our committee via one of the methods below</p>
                 </div>
                 <div class="col-lg-3 text-center">
-                    <a href="http://fb.com/ulcomputersoc"><i class="fa fa-facebook fa-3x sr-contact"></i></a>
-                    <p><a href="http://fb.com/ulcomputersoc">fb.com/ulcomputersoc</a></p>
+                    <a href=" https://fb.com/ulcomputersoc"><i class="fa fa-facebook fa-3x sr-contact"></i></a>
+                    <p><a href=" https://fb.com/ulcomputersoc">fb.com/ulcomputersoc</a></p>
                 </div>
 		<div class="col-lg-3 text-center">
-                    <a href="http://instagr.am/ulcompsoc/"><i class="fa fa-instagram fa-3x sr-contact"></i></a>
-                    <p><a href="http://instagr.am/ulcompsoc/">instagr.am/ulcompsoc</a></p>
+                    <a href=" https://instagr.am/ulcompsoc/"><i class="fa fa-instagram fa-3x sr-contact"></i></a>
+                    <p><a href=" https://instagr.am/ulcompsoc/">instagr.am/ulcompsoc</a></p>
                 </div>
 		<div class="col-lg-3 text-center">
-                    <a href="http://skynet.ie/forum/"><i class="fa fa-comments fa-3x sr-contact"></i></a>
-                    <p><a href="http://skynet.ie/forum/">CompSoc Forum</a></p>
+                    <a href=" https://skynet.ie/forum/"><i class="fa fa-comments fa-3x sr-contact"></i></a>
+                    <p><a href=" https://skynet.ie/forum/">CompSoc Forum</a></p>
                 </div>
                 <div class="col-lg-3 text-center">
                     <script type="text/javascript">emailE = 'skynet.ie';emailE = ('contact' + '@' + emailE);document.write('<a href="mailto:' + emailE + '">' + '<i class="fa fa-envelope-o fa-3x sr-contact"></i>' + '</a>');</script>