diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 276b1c660..64db6bd6b 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -541,19 +541,19 @@
 			var guessedEVs = {};
 			var guessedPlus = '';
 			var guessedMinus = '';
-			buf += '<p><small>Suggested spread:';
+			buf += '<p class="suggested"><small>Suggested spread:';
 			if (role === '?') {
-				buf += '<br />(Please choose 4 moves to get a suggested spread)</small></p>';
+				buf += ' (Please choose 4 moves to get a suggested spread)</small></p>';
 			} else {
 				guessedEVs = this.guessEVs(role);
 				guessedPlus = guessedEVs.plusStat; delete guessedEVs.plusStat;
 				guessedMinus = guessedEVs.minusStat; delete guessedEVs.minusStat;
-				buf += ' <br /></small><button name="setStatFormGuesses">';
+				buf += ' </small><button name="setStatFormGuesses">'+role+': ';
 				for (var i in guessedEVs) {
 					buf += ''+guessedEVs[i]+' '+BattleStatNames[i]+' / ';
 				}
-				buf += ' (+'+BattleStatNames[guessedPlus]+', -'+BattleStatNames[guessedMinus]+')</button>';
-				buf += ' <small><br />('+role+' | bulk: phys '+Math.round(this.moveCount.physicalBulk/1000)+' + spec '+Math.round(this.moveCount.specialBulk/1000)+' = '+Math.round(this.moveCount.bulk/1000)+')</small></p>';
+				buf += ' (+'+BattleStatNames[guessedPlus]+', -'+BattleStatNames[guessedMinus]+')</button></p>';
+				//buf += ' <small>('+role+' | bulk: phys '+Math.round(this.moveCount.physicalBulk/1000)+' + spec '+Math.round(this.moveCount.specialBulk/1000)+' = '+Math.round(this.moveCount.bulk/1000)+')</small>';
 			}
 
 			if (setGuessed) {
diff --git a/style/client.css b/style/client.css
index 9a8ec293f..d26de4d80 100644
--- a/style/client.css
+++ b/style/client.css
@@ -1727,9 +1727,12 @@ a.ilink:hover {
 }
 
 .statform {
-	padding: 10px 13px;
+	padding: 3px 13px 10px 13px;
 	font-size: 10pt;
 }
+.statform p.suggested {
+	margin: 5px 0;
+}
 .statform .col > div {
 	padding-top: 1px;
 	height: 28px;