diff --git a/src/components/Questions.module.css b/src/components/Questions.module.css
index 906c458..3c0472d 100644
--- a/src/components/Questions.module.css
+++ b/src/components/Questions.module.css
@@ -3,4 +3,5 @@
   background-color: #9999ff;
   color: black;
   padding: 10px;
+  word-wrap: break-word;
 }
diff --git a/src/components/SubjectSelector.js b/src/components/SubjectSelector.js
index ed194e4..44a0f49 100644
--- a/src/components/SubjectSelector.js
+++ b/src/components/SubjectSelector.js
@@ -1,5 +1,3 @@
-// TODO: add number next to it
-
 import styles from './SubjectSelector.module.css'
 
 export default function SubjectSelector (props) {
@@ -21,7 +19,7 @@ export default function SubjectSelector (props) {
             key={i}
             onClick={() => onSubjSelect(subj.Name)}
           >
-            <span>
+            <span className={styles.subjName}>
               {subj.Name}
             </span>
             <span className={styles.questionCount}>
diff --git a/src/components/SubjectSelector.module.css b/src/components/SubjectSelector.module.css
index 6c444a1..f9f2901 100644
--- a/src/components/SubjectSelector.module.css
+++ b/src/components/SubjectSelector.module.css
@@ -1,3 +1,8 @@
 .questionCount {
   justify-content: flex-end;
+  white-space: nowrap;
+}
+
+.subjName {
+  word-wrap: break-word;
 }