diff --git a/webclient/src/Classes.js b/webclient/src/Classes.js
index 7d38f44..9994610 100644
--- a/webclient/src/Classes.js
+++ b/webclient/src/Classes.js
@@ -155,6 +155,9 @@ function NewClassTable(props) {
 								{name}
 							</Label>
 						)}
+
+						<p/>
+						<p>No upcoming classes.</p>
 					</Segment>
 				)}
 			</div>
@@ -275,32 +278,42 @@ export function Classes(props) {
 			<p>
 				Filter by tag:
 				<div className='coursetags'>
-					{Object.entries(tags).map(([name, color]) =>
+					<div
+						className='labelbox'
+						style={{borderColor: tagFilter === false ? 'black' : 'transparent'}}
+					>
 						<Label
 							onClick={() => {
-								setTagFilter(name);
-								tagFilterCache = name;
+								setTagFilter(false);
+								tagFilterCache = false;
 							}}
 							as='a'
-							color={color}
 							tag
 						>
-							{name}
+							No Filter
 						</Label>
+					</div>
+
+					{Object.entries(tags).map(([name, color]) =>
+						<div
+							className='labelbox'
+							style={{borderColor: tagFilter === name ? 'black' : 'transparent'}}
+						>
+							<Label
+								onClick={() => {
+									setTagFilter(name);
+									tagFilterCache = name;
+								}}
+								as='a'
+								color={color}
+								tag
+							>
+								{name}
+							</Label>
+						</div>
 					)}
 				</div>
 			</p>
-			<p>
-				{tagFilter && <Button
-					onClick={() => {
-						setTagFilter(false);
-						tagFilterCache = false;
-					}}
-				>
-					Clear {tagFilter} filter
-				</Button>}
-			</p>
-
 
 			{classes.length && courses.length ?
 				sortByCourse ?
diff --git a/webclient/src/Courses.js b/webclient/src/Courses.js
index e664abd..41952a6 100644
--- a/webclient/src/Courses.js
+++ b/webclient/src/Courses.js
@@ -56,31 +56,42 @@ export function Courses(props) {
 			<p>
 				Filter by tag:
 				<div className='coursetags'>
-					{Object.entries(tags).map(([name, color]) =>
+					<div
+						className='labelbox'
+						style={{borderColor: tagFilter === false ? 'black' : 'transparent'}}
+					>
 						<Label
 							onClick={() => {
-								setTagFilter(name);
-								tagFilterCache = name;
+								setTagFilter(false);
+								tagFilterCache = false;
 							}}
 							as='a'
-							color={color}
 							tag
 						>
-							{name}
+							No Filter
 						</Label>
+					</div>
+
+					{Object.entries(tags).map(([name, color]) =>
+						<div
+							className='labelbox'
+							style={{borderColor: tagFilter === name ? 'black' : 'transparent'}}
+						>
+							<Label
+								onClick={() => {
+									setTagFilter(name);
+									tagFilterCache = name;
+								}}
+								as='a'
+								color={color}
+								tag
+							>
+								{name}
+							</Label>
+						</div>
 					)}
 				</div>
 			</p>
-			<p>
-				{tagFilter && <Button
-					onClick={() => {
-						setTagFilter(false);
-						tagFilterCache = false;
-					}}
-				>
-					Clear {tagFilter} filter
-				</Button>}
-			</p>
 
 			{courses ?
 				<Table basic='very'>
diff --git a/webclient/src/light.css b/webclient/src/light.css
index 1761e1f..cf4ca6d 100644
--- a/webclient/src/light.css
+++ b/webclient/src/light.css
@@ -138,11 +138,17 @@ body {
 	flex-wrap: wrap;
 }
 
-.newclasstable .ui.tag.label {
+.ui.tag.label {
 	padding-left: 1rem;
 	padding-right: 0.5rem;
 }
 
+.labelbox {
+	display: inline;
+	padding: 0.55rem 0.1rem;
+	border: 2px solid black;
+}
+
 .usage {
 	height: 100vh;
 	background-color: black;