diff --git a/src/pvv/side/agenda.php b/src/pvv/side/agenda.php
index daa9afa..76ccfa1 100644
--- a/src/pvv/side/agenda.php
+++ b/src/pvv/side/agenda.php
@@ -1,9 +1,6 @@
 <?php //declare(strict_types=1);
 namespace pvv\side;
 
-use \pvv\side\social\NerdepitsaActivity;
-use \pvv\side\social\AnimekveldActivity;
-
 use \DateTimeImmutable;
 use \DateInterval;
 
@@ -74,7 +71,9 @@ class Agenda {
 			function($a) use ($startDate){
 				return $a->getNextEventFrom($startDate);
 			}, $this->activities
-		), function($a){return $a;});
+		), function($a){
+			return isset($a);
+		});
 		usort($result, function($a, $b) {
 			return ($a->getStart()->getTimeStamp() < $b->getStart()->getTimeStamp())
 				? -1
diff --git a/src/pvv/side/social/brettspillevent.php b/src/pvv/side/social/brettspillevent.php
index 3395da4..cc9c3a8 100644
--- a/src/pvv/side/social/brettspillevent.php
+++ b/src/pvv/side/social/brettspillevent.php
@@ -20,7 +20,7 @@ class BrettspillEvent extends Event {
 	}
 
 	public function getOrganiser() /* : User */ {
-		return "PVV";
+		return "Robert Maikher";
 	}
 
 	public function getURL() /* : string */ {
diff --git a/www/css/splash.css b/www/css/splash.css
index 5fb2bb5..81c3f63 100644
--- a/www/css/splash.css
+++ b/www/css/splash.css
@@ -12,6 +12,7 @@ img.float-right {
 .calendar-events ul .date {
 	color: rgba(0,0,0,.5);
 	font-size: 0.8em;
+	margin-top: .2em;
 }
 .calendar-events > li > p {
 	border-bottom: .1em solid rgba(0,0,0,.2);
@@ -30,8 +31,8 @@ img.float-right {
 	text-decoration: underline;
 }
 .calendar-events ul .time {
-	float: left;
-	width: 4em;
+	color: rgba(0,0,0,.5);
+	float: right;
 }
 .calendar-events ul .icon, .calendar-events ul .date {
 	float: right;
diff --git a/www/index.php b/www/index.php
index 9fac9a4..2be073b 100644
--- a/www/index.php
+++ b/www/index.php
@@ -54,13 +54,13 @@ include '../inc/ticker.php';
 <li>
 <a href="<?= htmlspecialchars($event->getURL()) ?>"><?= $event->getName(); ?></a>
 <?php /* <a class="icon subscribe">+</a> */ ?>
-<?php if ($period) {
+<?php if ($period !== \pvv\side\Agenda::TODAY) {
+	echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
 	if (\pvv\side\Agenda::isThisWeek($event->getStart()) || $event->getStart()->sub(new DateInterval('P3D'))->getTimestamp() < time()) {
-		echo '<span class="time">' . strftime('%a', $event->getStart()->getTimestamp()) . '</span>';
+		echo '<span class="date">' . strftime('%a', $event->getStart()->getTimestamp()) . '</span>';
 	} else {
-		echo '<span class="time">' . strftime('%e. %b', $event->getStart()->getTimestamp()) . '</span>';
+		echo '<span class="date">' . strftime('%e. %b', $event->getStart()->getTimestamp()) . '</span>';
 	}
-	echo '<span class="date">' . $event->getStart()->format('H:i') . '</span>';
 } else {
 	echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
 }
@@ -77,7 +77,9 @@ include '../inc/ticker.php';
 <p>
 Alle med tilknytning til NTNU kan bli medlem hos oss
 og benytte seg av våre ressurser.
-<!--For å bli med i våre prosjekter og komitéer må du søke.-->
+<!--
+For å bli med i våre prosjekter og komitéer må du søke.
+-->
 </p>
 <p>
 <a class="btn" href="paamelding/">Bli medlem</a>
diff --git a/www/aktiviteter/animekveld.jpg b/www/sosiale/animekveld.jpg
similarity index 100%
rename from www/aktiviteter/animekveld.jpg
rename to www/sosiale/animekveld.jpg
diff --git a/www/aktiviteter/brettspill.jpg b/www/sosiale/brettspill.jpg
similarity index 100%
rename from www/aktiviteter/brettspill.jpg
rename to www/sosiale/brettspill.jpg
diff --git a/www/aktiviteter/nerdepitsa.jpg b/www/sosiale/nerdepitsa.jpg
similarity index 100%
rename from www/aktiviteter/nerdepitsa.jpg
rename to www/sosiale/nerdepitsa.jpg