diff --git a/src/actions/auth.js b/src/actions/auth.js
index ce05047688ca802476be3f6f908c5179c7a0591a..daec89ee0441f522f672d7171a1959d375d67ef4 100644
--- a/src/actions/auth.js
+++ b/src/actions/auth.js
@@ -17,6 +17,7 @@ export const getUserData = () => (
         signed,
         groups,
         role,
+        bits
       } = user.data;
       let permission;
       switch (role) {
@@ -37,7 +38,7 @@ export const getUserData = () => (
       dispatch({
         type: GET_USERDATA,
         payload: {
-          id, joinDate, nick, motivationAbout, motivationProfession, motivationExercise, full_name, signed, groups, role, permission
+          id, joinDate, nick, motivationAbout, motivationProfession, motivationExercise, full_name, signed, groups, role, permission, bits
         },
       });
     } catch (e) {
diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index 090e4320720cbce7deb7f39094a15d94b5102f09..5ac1b25e7a16d0d08777286a7747effdedfe14c2 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Modal, Button, Form, Input, TextArea, Icon, Header, Segment, Message } from 'semantic-ui-react';
+import { Modal, Button, Form, Input, TextArea, Icon, Header, Segment, Divider } from 'semantic-ui-react';
 import { connect } from 'react-redux';
 import { addSolution, writeSolution, writeSolutionFile, addDocument, clearWrite } from '../../actions/homework';
 import './Forms.css';
@@ -44,12 +44,6 @@ class AddSolutionForm extends Component {
     const lastDesc = thisTaskDocument[0]?.description
     const lastFile = thisTaskDocument[0]?.file
 
-    console.log(lastName, lastDesc, lastFile)
-
-    // const name = thisTaskDocument[0]?.name
-    // const description = thisTaskDocument[0]?.description
-    // const file = '';
-
     const corrected = false;
     const accepted = false;
     const sentences = this.props.taskdesc.split('\n');
@@ -82,10 +76,9 @@ class AddSolutionForm extends Component {
             {sentences.map(s => (<p key={Math.random()}>{s}</p>))}
           </Modal.Description>
           {this.props.disabled ?
-            customMessage(disabledText, undefined, undefined, this.props.disabled) :
-            <Form>
+            <div>
               {lastName ?
-                <Segment style={{paddingBottom: '1em'}}>
+                <div style={{paddingBottom: '1em'}}>
                   <div style={{ marginBottom: '1em', fontWeight: 'bold' }}>LegutĂłbbi megoldĂĄsod:</div>
                   <Segment attached='top'>
                     <h5 style={{paddingBottom: '0.4em'}}>CĂ­m:</h5>
@@ -103,12 +96,39 @@ class AddSolutionForm extends Component {
                       <span>-</span>
                     }
                   </Segment>
-                </Segment>
+                </div>
+              :
+                customMessage(disabledText, undefined, undefined, this.props.disabled)
+              }
+            </div>
+            
+            :
+            <Form>
+              {lastName ?
+                <div style={{paddingBottom: '1em'}}>
+                  <div style={{ fontWeight: 'bold' }}>LegutĂłbbi megoldĂĄsod:</div>
+                  <Segment attached='top'>
+                    <h5 style={{paddingBottom: '0.4em'}}>CĂ­m:</h5>
+                    {lastName}
+                  </Segment>
+                  <Segment attached>
+                    <h5 style={{paddingBottom: '0.4em'}}>LeĂ­rĂĄs:</h5>
+                    {lastDesc}
+                  </Segment>
+                  <Segment attached='bottom'>
+                    <h5>Beadott fĂĄjl:</h5>
+                    {lastFile ? 
+                      <a href={lastFile} rel='noreferrer noopener' target='_blank'>FĂĄjl letĂśltĂŠse</a>
+                    :
+                      <span>-</span>
+                    }
+                  </Segment>
+                </div>
                 
                 :
                 null
               }
-
+              <Divider />
               <Form.Field
                 control={Input}
                 label='MegoldĂĄs cĂ­me:'
diff --git a/src/components/pages/EventDetail.js b/src/components/pages/EventDetail.js
index 50e87621e44f549b25c1ea2cb9fac2c1478a3745..5c3ebb6001488c338a277cff02f5defb0d6976f4 100644
--- a/src/components/pages/EventDetail.js
+++ b/src/components/pages/EventDetail.js
@@ -50,7 +50,6 @@ class EventDetail extends Component {
         />
       );
     });
-    return null
   }
 
   renderEvent() {
diff --git a/src/components/pages/Homework.js b/src/components/pages/Homework.js
index 01ec0595f76f16f5c35ed7b3cad8c8bdc32e4612..56a4b7b0d3917cafd60c215c10a8d0e50f9050f1 100644
--- a/src/components/pages/Homework.js
+++ b/src/components/pages/Homework.js
@@ -7,6 +7,7 @@ import {
   Icon,
   Message,
   Button,
+  Label,
 } from 'semantic-ui-react';
 import { connect } from 'react-redux';
 import moment from 'moment';
@@ -140,6 +141,16 @@ class Homework extends Component {
             <Table.Cell>
               {moment(task.deadline).format('YYYY. MM. DD. HH:mm')}
             </Table.Cell>
+
+            <Table.Cell>
+              <Label color={
+                  displayTypes[this.getTaskDisplayStyle(task)].rowstyle.positive ? 
+                    'green' 
+                  : moment().isAfter(task.deadline) ? 'red' 
+                  : displayTypes[this.getTaskDisplayStyle(task)].rowstyle.negative ? 'red': null}>
+                {task.bits} bit 
+              </Label>
+            </Table.Cell>
             {/* Status (JavĂ­tĂĄsra vĂĄr, ...) */}
             <Table.Cell>
               <Icon name={displayTypes[this.getTaskDisplayStyle(task)].icon} />{' '}
@@ -237,15 +248,17 @@ class Homework extends Component {
             <Table.Row>
               <Table.HeaderCell>
                 <Icon circular name='home' />
-              Feladat megnevezĂŠse / beadĂĄsa
+                Feladat megnevezĂŠse / beadĂĄsa
               </Table.HeaderCell>
               <Table.HeaderCell>
                 <Icon circular name='calendar' />
-              Beadási határidő
+                Beadási határidő
+              </Table.HeaderCell>
+              <Table.HeaderCell width={2}>
               </Table.HeaderCell>
               <Table.HeaderCell>
                 <Icon circular name='tasks' />
-              Állapot
+                Állapot
               </Table.HeaderCell>
             </Table.Row>
           </Table.Header>
@@ -310,7 +323,9 @@ class Homework extends Component {
           <Header
             as='h1'
             dividing
-            content={headerText}
+            content={
+              headerText
+            }
             style={{
                 fontSize: '2em',
                 fontWeight: 'normal',
@@ -333,7 +348,7 @@ class Homework extends Component {
 
     if (user.role === 'Student') {
       return (
-        <div>
+        <div style={{paddingBottom: '2em'}}>
           {this.renderHomeworks(true, false)}
           {this.renderHomeworks(false, false)}
         </div>