diff --git a/Universal_Serial_Adapter/Project.h b/Universal_Serial_Adapter/Project.h
index df9d8de..9ef4762 100644
--- a/Universal_Serial_Adapter/Project.h
+++ b/Universal_Serial_Adapter/Project.h
@@ -46,6 +46,7 @@ enum serialmode {
   db9_norm, 
   db9_null, 
   cisco,
+  modelinespeed,
   none=-1
 };
 
@@ -164,14 +165,6 @@ void printTx(bool show) {
   lcd.setLine(rtXPosStart, rtYPosStart, rtXPosEnd, rtYPosEnd, color);
 }
 
-void printLineSpeed(linespeed aLineSpeed) {
-  int xPos = xLoc(6);
-  int yPos = yLoc(5);
-  
-  lcd.setStr("       ", xPos, yPos, BACKGROUND, BACKGROUND);
-  lcd.setStr(linespeeds[aLineSpeed].description, xPos, yPos, TEXT, BACKGROUND);
-}
-
 void printMode(serialmode aMode) {
   lcd.setStr(modeToText[aMode], xLoc(aMode), yLoc(1), TEXT, BACKGROUND);
 }
diff --git a/Universal_Serial_Adapter/Universal_Serial_Adapter.ino b/Universal_Serial_Adapter/Universal_Serial_Adapter.ino
index a6870b6..d1a2f9d 100644
--- a/Universal_Serial_Adapter/Universal_Serial_Adapter.ino
+++ b/Universal_Serial_Adapter/Universal_Serial_Adapter.ino
@@ -42,7 +42,7 @@ void setup() {
   
   // Print the modes
   //   Uses enum trickery -- don't assign values to serialmode enum values
-  for (int i=0; i<=cisco; i++) {
+  for (int i=0; i<modelinespeed; i++) {
     printMode((serialmode)i);
   }
   
@@ -84,7 +84,8 @@ void loop() {
 
 void setLineSpeed(linespeed aLineSpeed) {
   currentLineSpeed = aLineSpeed;
-  printLineSpeed(aLineSpeed);
+  bool sel = selectedMode == modelinespeed ? true : false;
+  printLineSpeed(aLineSpeed, sel);
 }
 
 void setMode(serialmode aMode) {
@@ -108,3 +109,22 @@ void setSelection(serialmode aMode) {
   lcd.setLine(xSelected, yLocOne, xSelected, yLocOne + selectedLength, HILIGHT);
   lcd.setLine(xPrevious, yLocOne, xPrevious, yLocOne + previousLength, BACKGROUND);
 }
+
+void printLineSpeed(linespeed aLineSpeed, bool selected) {
+  int xPosText = xLoc(6);
+  int yPosText = yLoc(5);
+  
+  int xPosLine = xLoc(7);
+  int yPosLine = yLoc(5);
+  
+  char* toPrint = linespeeds[aLineSpeed].description;
+  int length = strlen(toPrint);
+  
+  lcd.setStr("       ", xPosText, yPosText, BACKGROUND, BACKGROUND);
+  lcd.setLine(xPosLine, yPosLine, xPosLine, yPosLine + 7 * CHAR_WIDTH, BACKGROUND);
+
+  lcd.setStr(toPrint, xPosText, yPosText, TEXT, BACKGROUND);
+  if (selected) {
+    lcd.setLine(xPosLine, yPosLine, xPosLine, yPosLine + length * CHAR_WIDTH, HILIGHT);
+  }
+}