diff --git a/lib/react/gather.jsx b/lib/react/gather.jsx
index 34ba1aa..260959d 100644
--- a/lib/react/gather.jsx
+++ b/lib/react/gather.jsx
@@ -1,46 +1,5 @@
 "use strict";
 
-var VoteButton = React.createClass({
-	cancelVote(e) {
-		socket.emit("gather:vote", {
-			leader: {
-				candidate: null
-			}
-		});
-	},
-
-	vote(e) {
-		e.preventDefault();
-		socket.emit("gather:vote", {
-			leader: {
-				candidate: parseInt(e.target.value, 10)
-			}
-		});
-	},
-
-	render() {
-		if (this.props.currentGatherer === null) {
-			return false;
-		}
-		if (this.props.currentGatherer.leaderVote === this.props.candidate.id) {
-			return (
-				<button 
-					onClick={this.cancelVote} 
-					className="btn btn-xs btn-success">Voted
-				</button>
-			);
-		} else {
-			return (
-				<button 
-					onClick={this.vote} 
-					className="btn btn-xs btn-default"
-					value={this.props.candidate.id}>Vote
-				</button>
-			);
-		}
-	}
-});
-
 var SelectPlayerButton = React.createClass({
 	selectPlayer(e) {
 		e.preventDefault();
@@ -414,16 +373,59 @@ var GatherActions = React.createClass({
 	}
 });
 
-var ServerVoting = React.createClass({
-	handleServerVote(e) {
-		e.preventDefault();
+var VoteButton = React.createClass({
+	cancelVote(e) {
 		socket.emit("gather:vote", {
-			server: {
-				id: parseInt(e.target.value, 10)
+			leader: {
+				candidate: null
 			}
 		});
 	},
 
+	vote(e) {
+		e.preventDefault();
+		socket.emit("gather:vote", {
+			leader: {
+				candidate: parseInt(e.target.value, 10)
+			}
+		});
+	},
+
+	render() {
+		if (this.props.currentGatherer === null) {
+			return false;
+		}
+		if (this.props.currentGatherer.leaderVote === this.props.candidate.id) {
+			return (
+				<button 
+					onClick={this.cancelVote} 
+					className="btn btn-xs btn-success">Voted
+				</button>
+			);
+		} else {
+			return (
+				<button 
+					onClick={this.vote} 
+					className="btn btn-xs btn-default"
+					value={this.props.candidate.id}>Vote
+				</button>
+			);
+		}
+	}
+});
+
+var ServerVoting = React.createClass({
+	voteHandler(serverId) {
+		return function (e) {
+			e.preventDefault();
+			socket.emit("gather:vote", {
+				server: {
+					id: serverId
+				}
+			});
+		}
+	},
+
 	votesForServer(server) {
 		return this.props.gather.gatherers.reduce((acc, gatherer) => {
 			if (server.id === gatherer.serverVote) acc++;
@@ -433,51 +435,53 @@ var ServerVoting = React.createClass({
 
 	render() {
 		var self = this;
-		var servers = self.props.servers.map(server => {
-			var voteButton;
+		let servers = self.props.servers.map(server => {
+			let voteButton;
+			let votes = self.votesForServer(server);
 			if (self.props.currentGatherer.serverVote === server.id) {
-				voteButton = (<button
-											data-disabled="true"
-											className="btn btn-xs btn-success">
-											Voted</button>)
+				return (
+					<a href="#" className="list-group-item list-group-item-success" key={server.id}>
+						<span className="badge">{votes}</span>
+						{server.description || server.dns}
+					</a>
+				);				
 			} else {
-				voteButton = (<button
-											onClick={self.handleServerVote}
-											value={server.id}
-											className="btn btn-xs btn-primary">
-											Vote</button>);
+				return (
+					<a href="#" className="list-group-item" 
+						onClick={self.voteHandler(server.id)}
+						key={server.id}>
+						<span className="badge">{votes}</span>
+						{server.description || server.dns}
+					</a>
+				);
 			}
-			return (
-				<tr key={server.id}>
-					<td className="col-md-6">{server.description || server.dns}</td>
-					<td className="col-md-6 text-right">
-						{self.votesForServer(server)} Votes&nbsp;
-						{voteButton}
-					</td>
-				</tr>
-			);
 		});
+
+		let message = (self.props.currentGatherer.serverVote !== null) ? "Server Votes" : "Please Vote for a Server";
+
 		return (
 			<div className="panel panel-default">
 				<div className="panel-heading">
-					Server Voting
+					{message}
 				</div>
-				<table id="serverVoteTable" className="table table-condensed table-hover voting-table">
+				<div className="list-group gather-voting">
 					{servers}
-				</table>
+				</div>
 			</div>
 		);
 	}
 })
 
 var MapVoting = React.createClass({
-	handleMapVote(e) {
-		e.preventDefault();
-		socket.emit("gather:vote", {
-			map: {
-				id: parseInt(e.target.value, 10)
-			}
-		});
+	voteHandler(mapId) {
+		return function (e) {
+			e.preventDefault();
+			socket.emit("gather:vote", {
+				map: {
+					id: mapId
+				}
+			});
+		}
 	},
 
 	votesForMap(map) {
@@ -490,37 +494,36 @@ var MapVoting = React.createClass({
 	render() {
 		var self = this;
 		var maps = self.props.maps.map(map => {
-			var voteButton;
+			let votes = self.votesForMap(map);
 			if (self.props.currentGatherer.mapVote === map.id) {
-				voteButton = (<button
-											data-disabled="true"
-											className="btn btn-xs btn-success">
-											Voted</button>)
+				return (
+					<a href="#" 
+						key={map.id} 
+						className="list-group-item list-group-item-success">
+							<span className="badge">{votes}</span>
+							{map.name}
+					</a>
+				);
 			} else {
-				voteButton = (<button
-											onClick={self.handleMapVote}
-											value={map.id}
-											className="btn btn-xs btn-primary">
-											Vote</button>);
+				return (
+					<a href="#" 
+						key={map.id} 
+						onClick={self.voteHandler(map.id)}
+						className="list-group-item">
+							<span className="badge">{votes}</span>
+							{map.name}
+					</a>
+				);
 			}
-			return (
-				<tr key={map.id}>
-					<td className="col-md-6">{map.name}</td>
-					<td className="col-md-6 text-right">
-						{self.votesForMap(map)} Votes&nbsp;
-						{voteButton}
-					</td>
-				</tr>
-			);
 		});
 		return (
 			<div className="panel panel-default">
 				<div className="panel-heading">
 					Map Voting
 				</div>
-				<table className="table table-condensed table-hover voting-table">
+				<div className="list-group gather-voting">
 					{maps}
-				</table>
+				</div>
 			</div>
 		);
 	}
diff --git a/public/css/app.css b/public/css/app.css
index 4473493..68975e4 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -61,10 +61,6 @@ html, body {
 	padding: 80px 0px;
 }
 
-.voting-table {
-	font-size: 90%;
-}
-
 .max-width {
 	width: 100%;
 }
@@ -83,4 +79,8 @@ html, body {
 
 .spinner {
 	max-height: 30px !important;
-}
\ No newline at end of file
+}
+
+.gather-voting {
+	font-size: 90%;
+}
diff --git a/public/js/app.js b/public/js/app.js
index 56d1792..546a13f 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -2,51 +2,6 @@
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var VoteButton = React.createClass({
-	displayName: "VoteButton",
-
-	cancelVote: function cancelVote(e) {
-		socket.emit("gather:vote", {
-			leader: {
-				candidate: null
-			}
-		});
-	},
-
-	vote: function vote(e) {
-		e.preventDefault();
-		socket.emit("gather:vote", {
-			leader: {
-				candidate: parseInt(e.target.value, 10)
-			}
-		});
-	},
-
-	render: function render() {
-		if (this.props.currentGatherer === null) {
-			return false;
-		}
-		if (this.props.currentGatherer.leaderVote === this.props.candidate.id) {
-			return React.createElement(
-				"button",
-				{
-					onClick: this.cancelVote,
-					className: "btn btn-xs btn-success" },
-				"Voted"
-			);
-		} else {
-			return React.createElement(
-				"button",
-				{
-					onClick: this.vote,
-					className: "btn btn-xs btn-default",
-					value: this.props.candidate.id },
-				"Vote"
-			);
-		}
-	}
-});
-
 var SelectPlayerButton = React.createClass({
 	displayName: "SelectPlayerButton",
 
@@ -599,16 +554,63 @@ var GatherActions = React.createClass({
 	}
 });
 
+var VoteButton = React.createClass({
+	displayName: "VoteButton",
+
+	cancelVote: function cancelVote(e) {
+		socket.emit("gather:vote", {
+			leader: {
+				candidate: null
+			}
+		});
+	},
+
+	vote: function vote(e) {
+		e.preventDefault();
+		socket.emit("gather:vote", {
+			leader: {
+				candidate: parseInt(e.target.value, 10)
+			}
+		});
+	},
+
+	render: function render() {
+		if (this.props.currentGatherer === null) {
+			return false;
+		}
+		if (this.props.currentGatherer.leaderVote === this.props.candidate.id) {
+			return React.createElement(
+				"button",
+				{
+					onClick: this.cancelVote,
+					className: "btn btn-xs btn-success" },
+				"Voted"
+			);
+		} else {
+			return React.createElement(
+				"button",
+				{
+					onClick: this.vote,
+					className: "btn btn-xs btn-default",
+					value: this.props.candidate.id },
+				"Vote"
+			);
+		}
+	}
+});
+
 var ServerVoting = React.createClass({
 	displayName: "ServerVoting",
 
-	handleServerVote: function handleServerVote(e) {
-		e.preventDefault();
-		socket.emit("gather:vote", {
-			server: {
-				id: parseInt(e.target.value, 10)
-			}
-		});
+	voteHandler: function voteHandler(serverId) {
+		return function (e) {
+			e.preventDefault();
+			socket.emit("gather:vote", {
+				server: {
+					id: serverId
+				}
+			});
+		};
 	},
 
 	votesForServer: function votesForServer(server) {
@@ -621,53 +623,48 @@ var ServerVoting = React.createClass({
 	render: function render() {
 		var self = this;
 		var servers = self.props.servers.map(function (server) {
-			var voteButton;
+			var voteButton = undefined;
+			var votes = self.votesForServer(server);
 			if (self.props.currentGatherer.serverVote === server.id) {
-				voteButton = React.createElement(
-					"button",
-					{
-						"data-disabled": "true",
-						className: "btn btn-xs btn-success" },
-					"Voted"
+				return React.createElement(
+					"a",
+					{ href: "#", className: "list-group-item list-group-item-success", key: server.id },
+					React.createElement(
+						"span",
+						{ className: "badge" },
+						votes
+					),
+					server.description || server.dns
 				);
 			} else {
-				voteButton = React.createElement(
-					"button",
-					{
-						onClick: self.handleServerVote,
-						value: server.id,
-						className: "btn btn-xs btn-primary" },
-					"Vote"
+				return React.createElement(
+					"a",
+					{ href: "#", className: "list-group-item",
+						onClick: self.voteHandler(server.id),
+						key: server.id },
+					React.createElement(
+						"span",
+						{ className: "badge" },
+						votes
+					),
+					server.description || server.dns
 				);
 			}
-			return React.createElement(
-				"tr",
-				{ key: server.id },
-				React.createElement(
-					"td",
-					{ className: "col-md-6" },
-					server.description || server.dns
-				),
-				React.createElement(
-					"td",
-					{ className: "col-md-6 text-right" },
-					self.votesForServer(server),
-					" Votes ",
-					voteButton
-				)
-			);
 		});
+
+		var message = self.props.currentGatherer.serverVote !== null ? "Server Votes" : "Please Vote for a Server";
+
 		return React.createElement(
 			"div",
 			{ className: "panel panel-default" },
 			React.createElement(
 				"div",
 				{ className: "panel-heading" },
-				"Server Voting"
+				message
 			),
 			React.createElement(
-				"table",
-				{ id: "serverVoteTable", className: "table table-condensed table-hover voting-table" },
+				"div",
+				{ className: "list-group gather-voting" },
 				servers
 			)
 		);
@@ -677,13 +674,15 @@ var ServerVoting = React.createClass({
 var MapVoting = React.createClass({
 	displayName: "MapVoting",
 
-	handleMapVote: function handleMapVote(e) {
-		e.preventDefault();
-		socket.emit("gather:vote", {
-			map: {
-				id: parseInt(e.target.value, 10)
-			}
-		});
+	voteHandler: function voteHandler(mapId) {
+		return function (e) {
+			e.preventDefault();
+			socket.emit("gather:vote", {
+				map: {
+					id: mapId
+				}
+			});
+		};
 	},
 
 	votesForMap: function votesForMap(map) {
@@ -696,41 +695,35 @@ var MapVoting = React.createClass({
 	render: function render() {
 		var self = this;
 		var maps = self.props.maps.map(function (map) {
-			var voteButton;
+			var votes = self.votesForMap(map);
 			if (self.props.currentGatherer.mapVote === map.id) {
-				voteButton = React.createElement(
-					"button",
-					{
-						"data-disabled": "true",
-						className: "btn btn-xs btn-success" },
-					"Voted"
+				return React.createElement(
+					"a",
+					{ href: "#",
+						key: map.id,
+						className: "list-group-item list-group-item-success" },
+					React.createElement(
+						"span",
+						{ className: "badge" },
+						votes
+					),
+					map.name
 				);
 			} else {
-				voteButton = React.createElement(
-					"button",
-					{
-						onClick: self.handleMapVote,
-						value: map.id,
-						className: "btn btn-xs btn-primary" },
-					"Vote"
+				return React.createElement(
+					"a",
+					{ href: "#",
+						key: map.id,
+						onClick: self.voteHandler(map.id),
+						className: "list-group-item" },
+					React.createElement(
+						"span",
+						{ className: "badge" },
+						votes
+					),
+					map.name
 				);
 			}
-			return React.createElement(
-				"tr",
-				{ key: map.id },
-				React.createElement(
-					"td",
-					{ className: "col-md-6" },
-					map.name
-				),
-				React.createElement(
-					"td",
-					{ className: "col-md-6 text-right" },
-					self.votesForMap(map),
-					" Votes ",
-					voteButton
-				)
-			);
 		});
 		return React.createElement(
 			"div",
@@ -741,8 +734,8 @@ var MapVoting = React.createClass({
 				"Map Voting"
 			),
 			React.createElement(
-				"table",
-				{ className: "table table-condensed table-hover voting-table" },
+				"div",
+				{ className: "list-group gather-voting" },
 				maps
 			)
 		);