diff --git a/src/components/Tutorial/Assessment.js b/src/components/Tutorial/Assessment.js
index 0ff93e0..275e223 100644
--- a/src/components/Tutorial/Assessment.js
+++ b/src/components/Tutorial/Assessment.js
@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import BlocklyWindow from '../Blockly/BlocklyWindow';
 import SolutionCheck from './SolutionCheck';
 import CodeViewer from '../CodeViewer';
+import WorkspaceFunc from '../WorkspaceFunc';
 
 import Grid from '@material-ui/core/Grid';
 import Card from '@material-ui/core/Card';
@@ -21,10 +22,10 @@ class Assessment extends Component {
 
     return (
       <div style={{width: '100%'}}>
-        <Typography variant='h4' style={{marginBottom: '5px'}}>{currentTask.headline}</Typography>
+        <Typography variant='h4' style={{float: 'left', marginBottom: '5px', height: '40px', display: 'table'}}>{currentTask.headline}</Typography>
+        <div style={{float: 'right', height: '40px'}}><WorkspaceFunc solutionCheck/></div>
         <Grid container spacing={2} style={{marginBottom: '5px'}}>
-          <Grid item xs={12} md={6} lg={8} style={{ position: 'relative' }}>
-            <SolutionCheck />
+          <Grid item xs={12} md={6} lg={8}>
             <BlocklyWindow initialXml={statusTask ? statusTask.xml ? statusTask.xml : null : null}/>
           </Grid>
           <Grid item xs={12} md={6} lg={4}>
diff --git a/src/components/Tutorial/SolutionCheck.js b/src/components/Tutorial/SolutionCheck.js
index 3156fc6..7d5f979 100644
--- a/src/components/Tutorial/SolutionCheck.js
+++ b/src/components/Tutorial/SolutionCheck.js
@@ -63,7 +63,7 @@ class SolutionCheck extends Component {
         <Tooltip title='Lösung kontrollieren'>
           <IconButton
             className={this.props.classes.compile}
-            style={{width: '40px', height: '40px', position: 'absolute', top: 8, right: 8, zIndex: 21 }}
+            style={{width: '40px', height: '40px', marginRight: '5px'}}
             onClick={() => this.check()}
           >
             <FontAwesomeIcon icon={faPlay} size="xs"/>
diff --git a/src/components/WorkspaceFunc.js b/src/components/WorkspaceFunc.js
index 86a32db..d0414c1 100644
--- a/src/components/WorkspaceFunc.js
+++ b/src/components/WorkspaceFunc.js
@@ -10,6 +10,7 @@ import { saveAs } from 'file-saver';
 import { initialXml } from './Blockly/initialXml.js';
 
 import Compile from './Compile';
+import SolutionCheck from './Tutorial/SolutionCheck';
 
 import { withStyles } from '@material-ui/core/styles';
 import Button from '@material-ui/core/Button';
@@ -103,7 +104,7 @@ class WorkspaceFunc extends Component {
   render() {
     return (
       <div style={{width: 'max-content', display: 'flex'}}>
-        <Compile iconButton />
+        {this.props.solutionCheck ? <SolutionCheck /> : <Compile iconButton />}
         <Tooltip title='Blöcke speichern' arrow style={{marginRight: '5px'}}>
           <IconButton
             className={this.props.classes.button}