diff --git a/src/Pages/Software/SoftwareMain.js b/src/Pages/Software/SoftwareMain.js
index bc2b93d..f15d8af 100644
--- a/src/Pages/Software/SoftwareMain.js
+++ b/src/Pages/Software/SoftwareMain.js
@@ -4,6 +4,7 @@ import MarkdownPage from '../markdownPage';
 import { getLanguage } from '../../Language/Language';
 import { getString } from '../../Language/LanguageStrings'
 import educationData from './education.json'
+import CoursesTable from './coursesTable';
 
 const SoftwareMain = () => {
     const language = getLanguage();
@@ -30,35 +31,8 @@ const SoftwareMain = () => {
                 </div>
             ))}
             <hr />
-            <h2>{getString('certification')}</h2>
-            {educationData.certifications.map((certification, index) => (
-                <div key={certification.name + index}>
-                    <h4>{certification.name}</h4>
-                    <h6><a href={certification.link}>{certification.institution}</a></h6>
-                    <p>{getString('issued')}: {certification.issueYear}</p>
-                </div>
-            ))}
-            <hr />
-            <h2>{getString('courses')}</h2>
-            <div className="card-deck">
-                {educationData.courses.map((course, index) => (
-                    <div className='card courses-card' key={course.name + index}>
-                        <div className="card-body">
-                            <h5 className="card-title">{course.name}</h5>
-                            <p className="card-text">
-                                <i className='small'>{course.sub}, {course.instructor}</i>
-                                <br />
-                                <a href={course.link}>{course.intstitution}</a> | <a href={course.certificate}>certificate</a>
-                                <br />
-                                {getString('completed')}: {course.achieveDate}
-                            </p>
-                        </div>
-                        <div className="card-footer">
-                            <small className="text-muted">{course.duration} hours</small>
-                        </div>
-                    </div>
-                ))}
-            </div>
+            <h2>{getString('certification') + ' & ' + getString('courses')}</h2>
+            <CoursesTable />
         </article>
     )
 }
diff --git a/src/Pages/Software/education.json b/src/Pages/Software/education.json
index 6dcb68e..24fe77e 100644
--- a/src/Pages/Software/education.json
+++ b/src/Pages/Software/education.json
@@ -1,20 +1,4 @@
 {
-    "certifications": [
-        {
-            "name": "LPIC-1",
-            "institution": "Linux professional institute certification",
-            "link": "https://www.lpi.org/our-certifications/lpic-1-overview",
-            "issueYear": 2022,
-            "expiryYear": 2027
-        },
-        {
-            "name": "Drupal 9 Site Builder",
-            "institution": "Acquia",
-            "link": "https://certification.acquia.com/user/18196",
-            "issueYear": 2022,
-            "expiryYear": 9999
-        }
-    ],
     "courses": [
         {
             "name": "Responsive Web Design Essentials",