diff --git a/src/components/experiment-list/experiment-list-element.js b/src/components/experiment-list/experiment-list-element.js
index fac3130b0310ade7002fc9438b0e0e6b027944fd..01264d6cddb9f8c76ead5af1f93a6d7529375389 100644
--- a/src/components/experiment-list/experiment-list-element.js
+++ b/src/components/experiment-list/experiment-list-element.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { FaTrash, FaFileExport, FaShareAlt, FaClone } from 'react-icons/fa';
 import { RiPlayFill, RiPlayLine, RiPlayList2Fill } from 'react-icons/ri';
 import { VscTriangleUp, VscTriangleDown } from 'react-icons/vsc';
+import { AiFillExperiment } from 'react-icons/ai';
 import { GoFileSubmodule } from 'react-icons/go';
 
 import timeDDHHMMSS from '../../utility/time-filter.js';
@@ -167,21 +168,21 @@ export default class ExperimentListElement extends React.Component {
                     disabled={this.isLaunchDisabled()}
                     className='nrp-btn btn-default'
                     title={this.launchButtonTitle} >
-                    <RiPlayFill className='icon' />Launch
+                    <AiFillExperiment className='icon' />Open
                   </button>
                   : null}
 
-                {exp.rights.launch /*&& config.brainProcesses > 1*/ ?
+                {/*exp.rights.launch && config.brainProcesses > 1 ?
                   <button className='nrp-btn btn-default'>
                     <RiPlayLine className='icon' />Launch in Single Process Mode
                   </button>
-                  : null}
+                  : null*/}
 
-                {exp.rights.launch /*&& this.props.availableServers.length > 1*/ ?
+                {/*exp.rights.launch && this.props.availableServers.length > 1 ?
                   <button className='nrp-btn btn-default' >
                     <RiPlayList2Fill className='icon' />Launch Multiple
                   </button>
-                  : null}
+                : null*/}
 
                 {/* isPrivateExperiment */}
                 {exp.rights.delete ?
diff --git a/src/services/experiments/files/public-experiments-service.js b/src/services/experiments/files/public-experiments-service.js
index 88e10eaaa525decfdb7b6bdb0039d54bd51d2dc2..0189a84fa18bb7b93b504a0e6b6587bfc3734e3c 100644
--- a/src/services/experiments/files/public-experiments-service.js
+++ b/src/services/experiments/files/public-experiments-service.js
@@ -86,6 +86,10 @@ class PublicExperimentsService extends HttpService {
   sortExperiments(experimentList) {
     experimentList = experimentList.sort(
       (a, b) => {
+        if (!a.configuration.SimulationName || !b.configuration.SimulationName) {
+          return -1;
+        }
+
         let nameA = a.configuration.SimulationName.toLowerCase();
         let nameB = b.configuration.SimulationName.toLowerCase();
         if (nameA < nameB) {