diff --git a/src/components/SubjectSelector.js b/src/components/SubjectSelector.js
index 44a0f49..d03b7ab 100644
--- a/src/components/SubjectSelector.js
+++ b/src/components/SubjectSelector.js
@@ -4,7 +4,7 @@ export default function SubjectSelector (props) {
   const { activeSubjName, searchTerm, data, onSubjSelect } = props
 
   return (
-    <div className='subjectSelector'>
+    <div className={styles.subjectSelector}>
       {data.Subjects.map((subj, i) => {
         if (!subj.Name.toLowerCase().includes(searchTerm.toLowerCase())) {
           return null
diff --git a/src/components/SubjectSelector.module.css b/src/components/SubjectSelector.module.css
index f9f2901..38ad577 100644
--- a/src/components/SubjectSelector.module.css
+++ b/src/components/SubjectSelector.module.css
@@ -6,3 +6,10 @@
 .subjName {
   word-wrap: break-word;
 }
+
+.subjectSelector {
+  overflow: scroll;
+  height: 350px;
+  margin: 10px;
+}
+
diff --git a/src/components/subjectView.js b/src/components/subjectView.js
index 7ba3356..c4b03f0 100644
--- a/src/components/subjectView.js
+++ b/src/components/subjectView.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 
 import LoadingIndicator from '../components/LoadingIndicator.js'
 import Subject from '../components/Subject.js'
@@ -11,6 +11,16 @@ export default function SubjectView (props) {
   const [activeSubjName, setActiveSubjName] = useState('')
   const [searchTerm, setSearchTerm] = useState('')
 
+  const [sCount, setSCount] = useState(0)
+  const [qCount, setQCount] = useState(0)
+
+  useEffect(() => {
+    setSCount(data.Subjects.length)
+    setQCount(data.Subjects.reduce((acc, subj) => {
+      return acc + subj.Questions.length
+    }, 0))
+  }, [])
+
   if (data) {
     let currSubj = data.Subjects.find((subj) => {
       return subj.Name === activeSubjName
@@ -43,6 +53,9 @@ export default function SubjectView (props) {
           onSubjSelect={(subjName) => { setActiveSubjName(subjName) }}
         />
         <hr />
+        <div>
+          {qCount} kérdés, {sCount} tárgy
+        </div>
         <div>
           <Subject
             onChange={onChange}
diff --git a/src/defaultStyles.css b/src/defaultStyles.css
index 5fac2a8..76445d9 100644
--- a/src/defaultStyles.css
+++ b/src/defaultStyles.css
@@ -140,12 +140,6 @@ a {
   margin: 10px;
 }
 
-.subjectSelector {
-  overflow: scroll;
-  height: 200px;
-  margin: 10px;
-}
-
 .subjItem {
   font-size: 18px;
   padding: 3px;
diff --git a/src/pages/index.js b/src/pages/index.js
index fe8de1c..03574a7 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -163,6 +163,8 @@ export default function Index (props) {
         <div className={styles.welcome}>
           Kérdés szerkesztő
           <br />
+          {initialCount.questionCount} kérdés, {initialCount.subjectCount} tárgy
+          <p />
           Itt az éles adatbázis kérdései jelennek meg, amiket tudsz szerkeszteni. A kérdésekhez
           tartozó '.data' prop-ot még nem tudod rendesen szerkeszteni, az később lesz implementálva.
           A Tárgy / Kérdés nézet között tudsz válogatni.