diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 564ca47..5f7afba 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -98,7 +98,8 @@ class MY_Controller extends CI_Controller{
 //    public $version = '1.20.26';//gebudgetterde bedragen ipv toegekende budgtten in overzicht monfin, analoog aan bestemmingen
 //    public $version = '1.20.27';//dingen
  //   public $version = '1.21.00';//2factor
-	public $version = '1.21.00L'; //2factor -twee
+//	public $version = '1.21.00L'; //2factor -twee
+    public $version = '1.21.01M'; //verbeteringen compact sop
 
 
 
diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php
index 099eb43..d4bedbe 100644
--- a/application/views/monpas/compactsop/ijktabelcompact.php
+++ b/application/views/monpas/compactsop/ijktabelcompact.php
@@ -269,11 +269,12 @@
                     </tr>
                     <?php ;} ; ?>
                 </tbody>
-                <tr >
-                    <td colspan="8"
-                        class="inforegel">Scores in procenten</td>
-                </tr>
+<!--                <tr >-->
+<!--                    <td colspan="8"-->
+<!--                        class="inforegel">Scores in procenten</td>-->
+<!--                </tr>-->
             </table>
+            <span>scores in procenten</span>
         <?php }; ?> <!-- if lijst[0]->scores  -->
     </div>
 </div>
diff --git a/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php b/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php
index 401953d..5ef4818 100644
--- a/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php
+++ b/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php
@@ -3,7 +3,7 @@
       data-bind=" css{ geenrand: selected} ">
 <!--    class="naamvak"-->
     <div class="panel-heading"
-         style="height: 60px;"
+         style="height: 60px; padding-top: 0"
             data-bind="css: {lichtsop: geenGegevens(), witsop: selected() }">
             <h4 data-bind="text: toonnummer + '. ' + naam,
                            click: $root.fSelecteerOnderdeel">
diff --git a/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php b/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
index 2555a74..71fd7db 100644
--- a/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
+++ b/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
@@ -34,9 +34,16 @@
                       style="background-color:#930f50; 
                             color: white; padding: 10px; margin: 5px; 
                             margin-right: 15px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 50px; font-size: small;"
-                           data-bind="text: toonnummer + '. ' + naamkort ">
-                    </label>
+<!--                    <label style="padding-top: 15px; width: 50px; font-size: small;"-->
+<!--                           data-bind="text: toonnummer + '. ' + naamkort ">-->
+<!--                    </label>-->
+                    <table style="width: 100%">
+                        <tr>
+                            <td style="width: 18%; vertical-align: text-top; font-size: small" data-bind="text: toonnummer + '.' "></td>
+                            <td style="width: 82%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal"
+                                data-bind=" text: naamkort == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort "></td>
+                        </tr>
+                    </table>
                 </div>
                 <!-- /ko -->
                 <!-- ko if : isBreedBlok()  -->
@@ -44,9 +51,15 @@
                       data-bind="click: $root.fAnnuleerOnderdeel"
                       style="background-color:#930f50; color: white; 
                             margin: 5px; padding: 10px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 50px; font-size: small;"
-                           data-bind="text: toonnummer + '. ' + naamkort ">
-                    </label>
+<!--                    <label style="padding-top: 15px; width: 50px; font-size: small;"-->
+<!--                           data-bind="text: toonnummer + '. ' + naamkort ">-->
+<!--                    </label>-->
+                    <table style="width: 100%">
+                        <tr>
+                            <td style="width: 9%; font-size: small; vertical-align: text-top" data-bind="text: toonnummer"></td>
+                            <td style="width: 91%; font-size: small; vertical-align: text-top; word-break: break-word; white-space: normal" data-bind=" text: naamkort"></td>
+                        </tr>
+                    </table>
                 </div>
                 <!-- /ko -->
             </div><!-- for each onderdelen -->
diff --git a/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php b/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
index 1c0b84f..79f5de0 100644
--- a/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
+++ b/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
@@ -23,8 +23,16 @@
                                 </div>
 
                                 <div data-bind="visible: gevuld()">
-                                    <div style="color: white; font-size: small; word-break: break-word  " data-bind="text: toonnummer() + '. ' + naamkort()">
-                                    </div>
+<!--                                    <div style="color: white; font-size: small; word-break: break-word  " data-bind="text: toonnummer() + '. ' + naamkort()">-->
+<!--                                    </div>-->
+                                    <table style="width: 100%">
+                                        <tr>
+                                            <td style="width: 18%; vertical-align: text-top; font-size: small; color: white" data-bind="text: toonnummer() + '.' "></td>
+                                            <td style="width: 82%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal; color: white"
+                                                data-bind=" text: naamkort() == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort() == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort() "></td>
+                                        </tr>
+                                    </table>
+
                                 </div>
                             </div>
                         <!-- /ko -->
@@ -78,8 +86,15 @@
                         </div>
 
                         <div data-bind="visible: gevuld()">
-                            <div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()">
-                            </div>
+<!--                            <div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()">-->
+<!--                            </div>-->
+                            <table style="width: 100%">
+                                <tr>
+                                    <td style="width: 9%; vertical-align: text-top; font-size: small; color: white" data-bind="text: toonnummer() + '.' "></td>
+                                    <td style="width: 91%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal; color: white"
+                                        data-bind=" text: naamkort() == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort() == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort() "></td>
+                                </tr>
+                            </table>
                         </div>
                     </div>
                     <!-- /ko -->
@@ -125,9 +140,16 @@
                                     style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr  ? '#69970f' : '#930f50'}"
                       style     ="  color: white; padding: 10px; margin: 5px; 
                                     margin-right: 15px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word"
-                           data-bind="text: toonnummer + '. ' + naamkort ">
-                    </label>
+<!--                    <label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word"-->
+<!--                           data-bind="text: toonnummer + '. ' + naamkort ">-->
+<!--                    </label>-->
+                    <table style="width: 100%">
+                        <tr>
+                            <td style="width: 18%; vertical-align: text-top; font-size: small" data-bind="text: toonnummer + '.' "></td>
+                            <td style="width: 82%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal"
+                                data-bind=" text: naamkort == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort "></td>
+                        </tr>
+                    </table>
                 </div>
                 <!-- /ko -->
                 <!-- ko if : isBreedBlok()  -->
@@ -137,9 +159,15 @@
                                  style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr  ? '#69970f' : '#930f50'},"
                       style="color: white; 
                             margin: 5px; padding: 10px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word ;"
-                           data-bind="text: toonnummer + '. ' + naamkort ">
-                    </label>
+<!--                    <label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word ;"-->
+<!--                           data-bind="text: toonnummer + '. ' + naamkort ">-->
+<!--                    </label>-->
+                    <table style="width: 100%">
+                        <tr>
+                            <td style="width: 9%; font-size: small; vertical-align: text-top" data-bind="text: toonnummer"></td>
+                            <td style="width: 91%; font-size: small; vertical-align: text-top; word-break: break-word; white-space: normal" data-bind=" text: naamkort"></td>
+                        </tr>
+                    </table>
                 </div>
                 <!-- /ko -->
             </div><!-- for each onderdelen -->
diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css
index a3db4e8..52397b9 100644
--- a/public/css/monpas/main.css
+++ b/public/css/monpas/main.css
@@ -1280,7 +1280,7 @@ z-index: 50;
 /*.randinactief{*/
 /*	border: 1px solid #bfbfbf;*/
 /*}*/
-.geenrand{
+.vergeenrand{
 	border: none;
 	box-shadow: none;
 }
diff --git a/public/js/monpas/models/compactsopmodel.js b/public/js/monpas/models/compactsopmodel.js
index fe6fa6c..9d6ad8d 100644
--- a/public/js/monpas/models/compactsopmodel.js
+++ b/public/js/monpas/models/compactsopmodel.js
@@ -361,7 +361,13 @@ mh.initCompactSopModel = function(){
                     });//each
                     if (self.schooljaren() ) self.selectedSchooljaar(self.schooljaren()[0]);
                     self.organisaties(data.organisaties);
-                    self.selectedOrganisatie(self.organisaties()[0]);
+                    if(self.organisaties().length === 1)self.selectedOrganisatie(self.organisaties()[0])
+                    else{
+                        $.each(self.organisaties(), function(i,o){
+                            if(o.soort === self.toporgnr())
+                                self.selectedOrganisatie(self.organisaties()[i])
+                        })
+                    }
                 } // if
                 self.druk(false);
                 if (typeof callback == "function") callback()
@@ -374,6 +380,8 @@ mh.initCompactSopModel = function(){
             if(self.selectedSchooljaar() === undefined || self.selectedOrganisatie === undefined){
                 return;
             }
+            console.log(self.selectedOrganisatie().soort, 'orgsoort')
+
             switch(self.selectedOrganisatie().soort){
 
                 case '1':