diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..b9d18bf
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="GoogleStyle" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index c6a834d..6116051 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
       <entry name="!?*.form" />
@@ -13,12 +11,9 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="com.teamtreehouse.flashy.main" target="1.8" />
+      <module name="com.teamtreehouse.flashy.test" target="1.8" />
       <module name="flashy_main" target="1.8" />
       <module name="flashy_test" target="1.8" />
     </bytecodeTargetLevel>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 164b970..d5d79e0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0b6b7df..7863940 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/flashy.iml" filepath="$PROJECT_DIR$/.idea/modules/flashy.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/flashy_main.iml" filepath="$PROJECT_DIR$/.idea/modules/flashy_main.iml" group="flashy" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/flashy_test.iml" filepath="$PROJECT_DIR$/.idea/modules/flashy_test.iml" group="flashy" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/com.teamtreehouse.flashy.iml" filepath="$PROJECT_DIR$/.idea/modules/com.teamtreehouse.flashy.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/com.teamtreehouse.flashy.main.iml" filepath="$PROJECT_DIR$/.idea/modules/com.teamtreehouse.flashy.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/com.teamtreehouse.flashy.test.iml" filepath="$PROJECT_DIR$/.idea/modules/com.teamtreehouse.flashy.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/flashy.iml b/.idea/modules/com.teamtreehouse.flashy.iml
similarity index 92%
rename from .idea/modules/flashy.iml
rename to .idea/modules/com.teamtreehouse.flashy.iml
index 2f6b1cf..91b9bed 100644
--- a/.idea/modules/flashy.iml
+++ b/.idea/modules/com.teamtreehouse.flashy.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$/../..">
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/modules/flashy_main.iml b/.idea/modules/com.teamtreehouse.flashy.main.iml
similarity index 98%
rename from .idea/modules/flashy_main.iml
rename to .idea/modules/com.teamtreehouse.flashy.main.iml
index 3d7e5d1..44c5005 100644
--- a/.idea/modules/flashy_main.iml
+++ b/.idea/modules/com.teamtreehouse.flashy.main.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="flashy:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.teamtreehouse" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/../../out/production/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
diff --git a/.idea/modules/flashy_test.iml b/.idea/modules/com.teamtreehouse.flashy.test.iml
similarity index 97%
rename from .idea/modules/flashy_test.iml
rename to .idea/modules/com.teamtreehouse.flashy.test.iml
index 3c5b73a..b40e237 100644
--- a/.idea/modules/flashy_test.iml
+++ b/.idea/modules/com.teamtreehouse.flashy.test.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="flashy:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.teamtreehouse" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
@@ -9,7 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="flashy_main" />
+    <orderEntry type="module" module-name="com.teamtreehouse.flashy.main" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-web:1.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-thymeleaf:1.3.5.RELEASE" level="project" />
@@ -79,5 +79,5 @@
     <orderEntry type="library" name="Gradle: org.unbescape:unbescape:1.1.0.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.7" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="flashy_main" />
+  <component name="TestModuleProperties" production-module="com.teamtreehouse.flashy.main" />
 </module>
\ No newline at end of file
diff --git a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
index f127754..14509f8 100644
--- a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
+++ b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
@@ -12,6 +12,7 @@
 
 @Controller
 public class IndexController {
+  private static final int AMOUNT_TO_SHOW = 3;
   private FlashCardService flashCardService;
 
   @Autowired
@@ -22,18 +23,20 @@ public void setFlashCardService(FlashCardService flashCardService) {
   @RequestMapping("/")
   public String index(Model model) {
     StringBuilder ctaBuilder = new StringBuilder();
-    List<FlashCard> cards = flashCardService.getRandomFlashCards(5);
+    List<FlashCard> cards = flashCardService.getRandomFlashCards(AMOUNT_TO_SHOW);
     ctaBuilder.append("Refresh your memory about ");
     for (FlashCard card : cards) {
       ctaBuilder.append(card.getTerm());
-      if (card != cards.get(cards.size() - 1)) {
+        if (card != cards.get(cards.size() - 1)) {
         ctaBuilder.append(", ");
       }
     }
-    ctaBuilder.append(" and ");
     Long totalCount = flashCardService.getCurrentCount();
-    ctaBuilder.append(totalCount);
-    ctaBuilder.append(" more");
+    if (totalCount > AMOUNT_TO_SHOW) {
+      ctaBuilder.append(" and ");
+      ctaBuilder.append(totalCount - AMOUNT_TO_SHOW);
+      ctaBuilder.append(" more");
+    }
     model.addAttribute("cta", ctaBuilder.toString());
     model.addAttribute("flashCardCount", totalCount);
     return "index";