diff --git a/client/src/Event.css b/client/src/Event.css
index ef38beb..9edd88f 100644
--- a/client/src/Event.css
+++ b/client/src/Event.css
@@ -2,3 +2,11 @@
   text-align: left;
 }
 
+.Event .when {
+  margin-bottom: 0.25rem;
+}
+
+.Event .what {
+  font-size: 1.25rem;
+  margin-bottom: 0.5rem;
+}
\ No newline at end of file
diff --git a/client/src/Event.js b/client/src/Event.js
index 6a7e623..0968dc3 100644
--- a/client/src/Event.js
+++ b/client/src/Event.js
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useContext } from "react";
 import Paper from '@mui/material/Paper';
 import MomentUtils from '@date-io/moment'
-import { Calendar, MuiPickersUtilsProvider, ClockView } from '@material-ui/pickers';
+import { Calendar, MuiPickersUtilsProvider } from '@material-ui/pickers';
 import Moment from 'react-moment';
 import moment from 'moment';
 
@@ -92,10 +92,17 @@ function Event({ groupId }) {
         
       </div>
       <div>
-        <div>{event.description}</div>
-        <div>
+        <div className='what'>{event.description}</div>
+        <div className='when'>
           Next event is occurring <Moment fromNow date={event.date} /> on <Moment format={'MMMM Do YYYY, h: mm: ss a'} date={event.date} />.
         </div>
+        { event.votingBegins === 'day-of' && 
+          <div>Voting for location begins the day of the event.</div>
+        }
+        { event.votingBegins !== 'day-of' &&
+          <div>Vote any time for the location.</div>
+        }
+        <div>Voting for location closes at {event.votingCloses}.</div>
       </div>
     </div>
   </div>;
diff --git a/client/src/Group.js b/client/src/Group.js
index 142a2be..54ff70e 100644
--- a/client/src/Group.js
+++ b/client/src/Group.js
@@ -106,6 +106,10 @@ function Group() {
     effect();
   }, [user, setGroup, groupId, csrfToken, setError]);
 
+  if (!group) {
+    return <></>;
+  }
+  
   return (
     <Paper className="Group" style={{
       display: 'flex',
diff --git a/server/event-data.js b/server/event-data.js
index f3dc8b8..ec756b3 100644
--- a/server/event-data.js
+++ b/server/event-data.js
@@ -2,6 +2,8 @@ const originalEvents = [ {
   groupId: 1,
   name: 'Tuesday',
   event: 'tuesday',
+  votingBegins: 'day-of',
+  votingCloses: '3:00 PM',
   description: 'Get together every Tuesday with friends for happy hour!',
   date: Date.now() + 86400 * 14 * 1000 /* 2 weeks from now */
 } ];