diff --git a/src/components.d.ts b/src/components.d.ts
index e6a93069112c46fd9150f9b0fc6e8822047a96c2..668ae9da32cd87c760bd51cfd83d49a86f0462a2 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -243,6 +243,7 @@ export namespace Components {
     variant: CheckboxVariants;
   }
   interface HyContentList {
+    creditsLabel: string;
     dataItems: string;
     linkLabel: string;
   }
@@ -1528,6 +1529,7 @@ declare namespace LocalJSX {
     variant?: CheckboxVariants;
   }
   interface HyContentList {
+    creditsLabel?: string;
     dataItems?: string;
     linkLabel?: string;
   }
diff --git a/src/components/courses/hy-content-list-item/hy-content-list-item.tsx b/src/components/courses/hy-content-list-item/hy-content-list-item.tsx
index c08a3fe85af9c18b197cf5d36e300650b5202a39..3df481f1694ed8601f4e8f6f907b32b3a9729507 100644
--- a/src/components/courses/hy-content-list-item/hy-content-list-item.tsx
+++ b/src/components/courses/hy-content-list-item/hy-content-list-item.tsx
@@ -77,12 +77,9 @@ export class HyContentLstItem {
           <div class="hy-content-list-item--metadata--item hy-content-list-item--metadata--item--first">
             <span>{this._dateValue}</span>
           </div>
-          <div class="hy-content-list-item--metadata--item">
+          <div class="hy-content-list-item--metadata--item hy-content-list-item--metadata--item--last">
             <span>{this.courseStudyFormat}</span>
           </div>
-          <div class="hy-content-list-item--metadata--item hy-content-list-item--metadata--item--last ">
-            <span>{this.courseCredits}</span>
-          </div>
         </div>
         {this._courseTags && (
           <div class="hy-content-list-item--tags">
diff --git a/src/components/courses/hy-content-list/hy-content-list.tsx b/src/components/courses/hy-content-list/hy-content-list.tsx
index 2555aaffdfafd835b027bec2c128cbaf246e2ccf..10cf3f2af018eb9e37d0d3609b10ebfa7325a984 100644
--- a/src/components/courses/hy-content-list/hy-content-list.tsx
+++ b/src/components/courses/hy-content-list/hy-content-list.tsx
@@ -8,6 +8,7 @@ import {Component, ComponentInterface, Element, h, Host, Prop, State} from '@ste
 })
 export class HyContentList implements ComponentInterface {
   @Prop() linkLabel: string = 'Go to course page';
+  @Prop() creditsLabel: string = 'cr';
   @Prop() dataItems: string;
   private _dataItems: [];
   private variant: CourseVariants = CourseVariants.default;
@@ -34,8 +35,8 @@ export class HyContentList implements ComponentInterface {
 
         let courseItem = courseObject[courseProperty];
         let courseCode = courseItem['code'];
-        let courseName = courseItem['name'];
         let courseCredits = courseItem['credits'];
+        //let courseUnitName = courseItem['name'] + ', ' + courseCredits + ' ' + this.creditsLabel;
 
         if (courseItem['tags']) {
           let tags = JSON.parse(JSON.stringify(courseItem['tags']));
@@ -51,6 +52,8 @@ export class HyContentList implements ComponentInterface {
           for (let realisationProperty in realisations) {
             let realizationItem = realisations[realisationProperty];
 
+            let courseRealisationName = realizationItem['name'];
+            let courseRealisationFullName = courseRealisationName + ', ' + courseCredits + ' ' + this.creditsLabel;
             let courseStudyFormat = realizationItem['studyFormat'];
             let courseStartDate = realizationItem['startDate'];
             let courseEndDate = realizationItem['endDate'];
@@ -59,17 +62,13 @@ export class HyContentList implements ComponentInterface {
 
             const contentListItemClassAttributes = ['item', this.variant].join(' ');
 
-            //tabs[index].addEventListener('keydown', this.keydownEventListener);
-            //contentListItem.addEventListener('keydown', this.keydownEventListener);
-            //courseRealisations.push(contentListItem);
-
             courseRealisations.push(
               <hy-content-list-item
                 id={realisationProperty}
                 class={contentListItemClassAttributes}
                 variant={this.variant}
                 course-code={courseCode}
-                course-name={courseName}
+                course-name={courseRealisationFullName}
                 course-credits={courseCredits}
                 course-tags={courseTagsJSON}
                 course-start-date={courseStartDate}
diff --git a/src/components/courses/hy-content-list/readme.md b/src/components/courses/hy-content-list/readme.md
index ec30e6a5df27c16594f22be476c698b8577b8913..53ab92fe3cb7ff82441d25c7630fedf0b6bebef2 100644
--- a/src/components/courses/hy-content-list/readme.md
+++ b/src/components/courses/hy-content-list/readme.md
@@ -4,10 +4,11 @@
 
 ## Properties
 
-| Property    | Attribute    | Description | Type     | Default               |
-| ----------- | ------------ | ----------- | -------- | --------------------- |
-| `dataItems` | `data-items` |             | `string` | `undefined`           |
-| `linkLabel` | `link-label` |             | `string` | `'Go to course page'` |
+| Property       | Attribute       | Description | Type     | Default               |
+| -------------- | --------------- | ----------- | -------- | --------------------- |
+| `creditsLabel` | `credits-label` |             | `string` | `'cr'`                |
+| `dataItems`    | `data-items`    |             | `string` | `undefined`           |
+| `linkLabel`    | `link-label`    |             | `string` | `'Go to course page'` |
 
 ## Dependencies
 
diff --git a/src/global/_breakpoints.scss b/src/global/_breakpoints.scss
index b7dd4b7a0652593dbd1eb11a0b5dedaf00a78107..002b6b80052a92b4219b1a939ae096c16742c3ba 100644
--- a/src/global/_breakpoints.scss
+++ b/src/global/_breakpoints.scss
@@ -10,7 +10,7 @@ $narrow: 30rem; // 480px  480-767
 $medium: 48rem; // 768px  768-959
 $wide: 60rem; // 960px-1200px; small
 $extrawide: 75.0625rem; // 1201px-1440px; mid-size
-$overwide: 90.063rem; // 1441px-1600px; large-size
+$overwide: 87.5rem; // 1400px-1600px; large-size
 $xlarge: 1601px; //1601px-1920px, x-large
 $fullhd: 120.0625rem; // 1921px
 $max-width: $extrawide;