diff --git a/assets/css/custom.css b/assets/css/custom.css
index 952d5128d9259ef649fe13edb3b581de2d62b2f8..2277100c4acb37fd4c1983f0a0982bcd559a1c41 100755
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -106,18 +106,6 @@ font-size: 32px;
   margin-top:10px;
 }
 
-.coverLetter{
-  margin-top:30px;
-
-}
-
-.linkCV{
-  float: right;
-  margin-top: 30px;
-  margin-bottom: 10px;
-}
-
-
 .registerForm{
   margin: 0 auto;
   /*padding:50px;*/
diff --git a/assets/js/components/ConfirmationModal.jsx b/assets/js/components/ConfirmationModal.jsx
index a8a0ee47dfb2a5e0f36694a591a49cbc57233f20..800e30175e6fd8b4cf1858ff6c6f3a7cc97e2767 100644
--- a/assets/js/components/ConfirmationModal.jsx
+++ b/assets/js/components/ConfirmationModal.jsx
@@ -37,7 +37,7 @@ export default class ConfirmationModal extends React.Component {
   handleYes = () => { this.state.callback(); this.handleClose(); }
 
   open = (header = this.state.header, content = this.state.content, icon = this.state.icon, callback = this.state.callback()) => {
-    this.setState({ modalOpen: true, header, content, callback });
+    this.setState({ modalOpen: true, header, content, callback, icon });
   };
 
   render = () => (
diff --git a/assets/js/components/LoginForm.jsx b/assets/js/components/LoginForm.jsx
index eb120ba307153ce00471fc2616cbaf2b42f88e73..265d166535f76685468aa7a08e257466ea4817e0 100644
--- a/assets/js/components/LoginForm.jsx
+++ b/assets/js/components/LoginForm.jsx
@@ -60,7 +60,7 @@ export default class LoginForm extends React.Component {
           <Form loading={this.state.loading} onSubmit={e => this.handleSubmit(e)} error={this.state.errorFlag}>
             <Form.Group widths="equal">
               <Form.Field>
-                <label htmlFor="id"> Username </label>
+                <label htmlFor="id"> Email </label>
                 <Input type="text" id="username" icon="user" iconPosition="left" placeholder="username" onChange={e => this.handleChange(e, 'username')} required />
               </Form.Field>
             </Form.Group>
diff --git a/core/serializers/vacancies.py b/core/serializers/vacancies.py
index 77a1e84c871ebebb6d6fa15e457df9289df049c0..c1ffaf652c62345895f998fb5b921dc930a2799c 100644
--- a/core/serializers/vacancies.py
+++ b/core/serializers/vacancies.py
@@ -1,14 +1,11 @@
 from rest_framework import serializers
 
-from core.models import Company
 from core.models.vacancies import Vacancy, Application
-from core.serializers.accounts import StudentSerializer
+from core.serializers.accounts import StudentSerializer, CompanySerializer
 
 
 class VacancySerializer(serializers.ModelSerializer):
-    company = serializers.PrimaryKeyRelatedField(
-        queryset=Company.objects.all()
-    )
+    company = CompanySerializer()
 
     class Meta:
         model = Vacancy