diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 5a144678653efeebfd84cc19ac18c9c82f6ab59a..bda9cb963bdf966c394abe77fb2b4671d8ec98d4 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -609,76 +609,119 @@ App.UI.SlaveInteract.diet = function(slave) {
 		His
 	} = getPronouns(slave);
 	let el = document.createElement('div');
-	const options = [];
 
-	options.push({text: `Healthy`, updateSlave: {diet: "healthy"}});
+	let title = document.createElement('div');
+	title.textContent = `Diet: `;
+	let choice = document.createElement('span');
+	choice.style.fontWeight = "bold";
+	choice.textContent = `${capFirstChar(slave.diet)} `;
+
+	title.append(choice);
+	el.append(title);
+
+	const health = [];
+	health.push({text: `Healthy`, updateSlave: {diet: "healthy"}});
 	if (V.dietCleanse === 1) {
 		if (slave.health.condition < 90 || slave.chem >= 10) {
-			options.push({text: `Cleanse`, updateSlave: {diet: "cleansing"}});
+			health.push({text: `Cleanse`, updateSlave: {diet: "cleansing"}});
 		} else {
-			options.push({text: `Cleanse`, disabled: `${He} is already healthy`});
+			health.push({text: `Cleanse`, disabled: `${He} is already healthy`});
 		}
 	}
-	if (slave.balls > 0 && V.cumProDiet === 1) {
-		options.push({text: `Cum production`, updateSlave: {diet: "cum production"}});
-	}
-	if (isFertile(slave) && slave.preg === 0 && V.dietFertility === 1) {
-		options.push({text: `Fertility`, updateSlave: {diet: "fertility"}});
-	}
+
+	const weight = [];
 	if (slave.weight >= -95) {
-		options.push({text: `Lose weight`, updateSlave: {diet: "restricted"}});
+		weight.push({text: `Lose weight`, updateSlave: {diet: "restricted"}});
 	} else {
-		options.push({text: `Lose weight`, disabled: `${He} is already underweight`});
+		weight.push({text: `Lose weight`, disabled: `${He} is already underweight`});
 	}
 	if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && V.feeder === 1) {
 		if (slave.weight > 10 || slave.weight < -10) {
-			options.push({text: `Correct weight`, updateSlave: {diet: "corrective"}});
+			weight.push({text: `Correct weight`, updateSlave: {diet: "corrective"}});
 		} else {
-			options.push({text: `Correct weight`, disabled: `${He} is already a healthy weight`});
+			weight.push({text: `Correct weight`, disabled: `${He} is already a healthy weight`});
 		}
 	}
 	if (slave.weight <= 200) {
-		options.push({text: `Fatten`, updateSlave: {diet: "fattening"}});
+		weight.push({text: `Fatten`, updateSlave: {diet: "fattening"}});
 	} else {
-		options.push({text: `Fatten`, disabled: `${He} is already overweight`});
-	}
-	if (V.feeder === 1) {
-		options.push({text: `Estrogen enriched`, updateSlave: {diet: "XX"}});
-		options.push({text: `Testosterone enriched`, updateSlave: {diet: "XY"}});
-		if (V.dietXXY === 1 && slave.balls > 0 && (slave.ovaries === 1 || slave.mpreg === 1)) {
-			options.push({text: `Herm hormone blend`, updateSlave: {diet: "XXY"}});
-		}
+		weight.push({text: `Fatten`, disabled: `${He} is already overweight`});
 	}
 
+	const muscle = [];
 	if (slave.muscles <= 95 && !isAmputee(slave)) {
-		options.push({text: `Build muscle`, updateSlave: {diet: "muscle building"}});
+		muscle.push({text: `Build muscle`, updateSlave: {diet: "muscle building"}});
 	} else if (!isAmputee(slave)) {
-		options.push({text: `Build muscle`, disabled: `${He} is maintaining ${his} enormous musculature`});
+		muscle.push({text: `Build muscle`, disabled: `${He} is maintaining ${his} enormous musculature`});
 	} else {
-		options.push({text: `Build muscle`, disabled: `${He} has no limbs and thus can't effectively build muscle`});
+		muscle.push({text: `Build muscle`, disabled: `${He} has no limbs and thus can't effectively build muscle`});
 	}
 
 	if ((slave.muscles > 5 || slave.fuckdoll === 0) && canWalk(slave)) {
-		options.push({text: `Slim down`, updateSlave: {diet: "slimming"}});
+		muscle.push({text: `Slim down`, updateSlave: {diet: "slimming"}});
 	} else if (!canWalk(slave)) {
-		options.push({text: `Slim down`, disabled: `${He} can't move and thus can't trim down`});
+		muscle.push({text: `Slim down`, disabled: `${He} can't move and thus can't trim down`});
 	} else if (slave.fuckdoll > 0) {
-		options.push({text: `Slim down`, disabled: `${He} has no muscles left to lose`});
+		muscle.push({text: `Slim down`, disabled: `${He} has no muscles left to lose`});
 	}
 
-	let title = document.createElement('div');
-	title.textContent = `Diet: `;
-	let choice = document.createElement('span');
-	choice.style.fontWeight = "bold";
-	choice.textContent = `${capFirstChar(slave.diet)} `;
+	const production = [];
+	if (slave.balls > 0 && V.cumProDiet === 1) {
+		production.push({text: `Cum production`, updateSlave: {diet: "cum production"}});
+	}
+	if (isFertile(slave) && slave.preg === 0 && V.dietFertility === 1) {
+		production.push({text: `Fertility`, updateSlave: {diet: "fertility"}});
+	}
 
-	title.append(choice);
-	el.append(title);
+	const hormone = [];
+	if (V.feeder === 1) {
+		hormone.push({text: `Estrogen enriched`, updateSlave: {diet: "XX"}});
+		hormone.push({text: `Testosterone enriched`, updateSlave: {diet: "XY"}});
+		if (V.dietXXY === 1 && slave.balls > 0 && (slave.ovaries === 1 || slave.mpreg === 1)) {
+			hormone.push({text: `Herm hormone blend`, updateSlave: {diet: "XXY"}});
+		}
+	}
 
-	let links = document.createElement('div');
-	links.appendChild(App.UI.SlaveInteract.generateRows(options, slave));
-	links.className = "choices";
-	el.append(links);
+	let links;
+	if (health.length) {
+		links = document.createElement('div');
+		links.append(`Health: `);
+		links.appendChild(App.UI.SlaveInteract.generateRows(health, slave));
+		links.className = "choices";
+		el.append(links);
+	}
+
+	if (weight.length) {
+		links = document.createElement('div');
+		links.append(`Weight: `);
+		links.appendChild(App.UI.SlaveInteract.generateRows(weight, slave));
+		links.className = "choices";
+		el.append(links);
+	}
+
+	if (muscle.length) {
+		links = document.createElement('div');
+		links.append(`Muscle: `);
+		links.appendChild(App.UI.SlaveInteract.generateRows(muscle, slave));
+		links.className = "choices";
+		el.append(links);
+	}
+
+	if (production.length) {
+		links = document.createElement('div');
+		links.append(`Production: `);
+		links.appendChild(App.UI.SlaveInteract.generateRows(production, slave));
+		links.className = "choices";
+		el.append(links);
+	}
+
+	if (hormone.length) {
+		links = document.createElement('div');
+		links.append(`Hormone: `);
+		links.appendChild(App.UI.SlaveInteract.generateRows(hormone, slave));
+		links.className = "choices";
+		el.append(links);
+	}
 
 	return jQuery('#diet').empty().append(el);
 };