diff --git a/PDMI/store/forms.py b/PDMI/store/forms.py
index adfaff6..d1217a2 100644
--- a/PDMI/store/forms.py
+++ b/PDMI/store/forms.py
@@ -4,19 +4,24 @@ from bootstrap_modal_forms.mixins import PopRequestMixin, CreateUpdateAjaxMixin
 from django import forms
 from .models import Version
 
+
 class CustomUserCreationForm(PopRequestMixin, CreateUpdateAjaxMixin,
                              UserCreationForm):
     class Meta:
         model = User
         fields = ['username', 'email', 'password1', 'password2']
 
+
 class CustomAuthenticationForm(AuthenticationForm):
     class Meta:
         model = User
         fields = ['username', 'password']
 
+
 class FileFieldForm(forms.Form):
-    file = forms.FileField(widget=forms.ClearableFileInput(attrs={'multiple': True}))
+    file = forms.FileField(
+        widget=forms.ClearableFileInput(attrs={'multiple': True}))
+
 
 class FileFieldForm(forms.ModelForm):
     class Meta:
@@ -24,7 +29,7 @@ class FileFieldForm(forms.ModelForm):
         fields = ['file']
         widgets = {
             'file': forms.ClearableFileInput(
-                attrs = {
+                attrs={
                     'multiple': True
                 }
             )
diff --git a/PDMI/store/models.py b/PDMI/store/models.py
index f6054ea..3d027ae 100644
--- a/PDMI/store/models.py
+++ b/PDMI/store/models.py
@@ -16,7 +16,7 @@ def upload_path(instance, filename):
 
 
 class Module(models.Model):
-    name = models.CharField(max_length=255)
+    name = models.CharField(max_length=255, unique=True)
     desc = models.TextField(max_length=2048, null=True)
     creator = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
 
@@ -34,6 +34,7 @@ class Version(models.Model):
     def __str__(self):
         return self.ver
 
+
 class Dependency(models.Model):
     version = models.ForeignKey(Version, on_delete=models.CASCADE)
     dep_module = models.CharField(max_length=255)
diff --git a/PDMI/store/templates/store/base.html b/PDMI/store/templates/store/base.html
index f347cb1..0522cd2 100644
--- a/PDMI/store/templates/store/base.html
+++ b/PDMI/store/templates/store/base.html
@@ -37,14 +37,14 @@
 {% endblock body %}
 
 {% block extra_js %}
-        <script type="text/javascript">
-            $(function() {
-                $("#registerLink").modalForm({
-                    formURL: "{% url 'signup_modal' %}"
-                });
-                $("#loginLink").modalForm({
-                    formURL: "{% url 'login_modal' %}"
-                });
-            });
-        </script>
+<script type="text/javascript">
+    $(function() {
+        $("#registerLink").modalForm({
+            formURL: "{% url 'signup_modal' %}"
+        });
+        $("#loginLink").modalForm({
+            formURL: "{% url 'login_modal' %}"
+        });
+    });
+</script>
 {% endblock extra_js %}
diff --git a/PDMI/store/templates/store/index.html b/PDMI/store/templates/store/index.html
index 1b7d6e3..19f0fd5 100644
--- a/PDMI/store/templates/store/index.html
+++ b/PDMI/store/templates/store/index.html
@@ -7,9 +7,8 @@
             <h1 class="display-3">PDMI Store</h1>
             <!-- Search form -->
             <form class="form-inline d-flex justify-content-center md-form form-sm mt-0">
-              <i class="fa fa-search" aria-hidden="true"></i>
-              <input class="form-control ml-3 w-75" type="text" placeholder="Search"
-                aria-label="Search">
+                <i class="fa fa-search" aria-hidden="true"></i>
+                <input class="form-control ml-3 w-75" type="text" placeholder="Search" aria-label="Search">
             </form>
         </div>
     </div>
@@ -25,8 +24,8 @@
                         <h6 class="card-subtitle mb-2 text-muted">Card subtitle - Description</h6>
                         <p class="card-text">Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
                             tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
-                             sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
-                         </p>
+                            sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
+                        </p>
                         <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
                     </div>
                 </div>
@@ -45,8 +44,8 @@
                         <h6 class="card-subtitle mb-2 text-muted">Card subtitle - Description</h6>
                         <p class="card-text">Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
                             tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
-                             sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
-                         </p>
+                            sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
+                        </p>
                         <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
                     </div>
                 </div>
@@ -65,8 +64,8 @@
                         <h6 class="card-subtitle mb-2 text-muted">Card subtitle - Description</h6>
                         <p class="card-text">Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
                             tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
-                             sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
-                         </p>
+                            sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
+                        </p>
                         <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
                     </div>
                 </div>
diff --git a/PDMI/store/templates/store/upload.html b/PDMI/store/templates/store/upload.html
index 41e4474..cbe735c 100644
--- a/PDMI/store/templates/store/upload.html
+++ b/PDMI/store/templates/store/upload.html
@@ -8,8 +8,8 @@
 {% block body %}
 <main>
     <div class="container pt-5">
-        <div class="alert alert-danger alert-dismissible fade show" id="errorZone" style="display:none;">
-            <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+        <div class="alert alert-danger alert-dismissible" id="errorZone" style="display:none;">
+            <a href="#" class="close" onclick="$('.alert').hide();">&times;</a>
         </div>
         <form class="dropzone" enctype="multipart/form-data" method="post" id="multiFileUpload">
             <div class="fallback">
@@ -67,6 +67,7 @@ $('#multiFileUpload').dropzone({
         });
         this.on("error", function(file, message) {
             console.log(message);
+            $('.alert').html('');
             $('#errorZone').append(message.error);
             $('#errorZone').show();
         });
diff --git a/PDMI/store/views.py b/PDMI/store/views.py
index c6c9705..219247b 100644
--- a/PDMI/store/views.py
+++ b/PDMI/store/views.py
@@ -31,6 +31,8 @@ class CustomLoginView(BSModalLoginView):
     extra_content = dict(success_url=reverse_lazy('index'))
 
 
+REQUIRED_FIELDS = ['name', 'description', 'version', 'bot_version']
+
 class UploadView(LoginRequiredMixin, FormView):
     form_class = FileFieldForm
     template_name = 'store/upload.html'
@@ -46,6 +48,7 @@ class UploadView(LoginRequiredMixin, FormView):
                 with open(zip_path, "wb+") as f:    # Writing archive
                     for chunk in file.chunks():
                         f.write(chunk)
+                # Check if uploaded file is a zip archive
                 if magic.from_file(zip_path, mime=True) != 'application/zip':
                     print(magic.from_file(zip_path))
                     os.remove(zip_path)
@@ -56,6 +59,10 @@ class UploadView(LoginRequiredMixin, FormView):
                 with open(os.path.join(extract_path, 'infos.toml'), 'r') as f:
                     # Reading and parsing toml file
                     module_info = toml.loads(f.read())
+                for required_field in REQUIRED_FIELDS:
+                    if not required_field in module_info.keys():
+                        return JsonResponse({'error': f'Field <strong>{required_field}\
+                                            </strong> is missing.'}, status=500)
                 shutil.rmtree(extract_path)
                 os.remove(zip_path)
                 if Module.objects.filter(name=module_info['name'].lower(),
@@ -84,9 +91,9 @@ class UploadView(LoginRequiredMixin, FormView):
                 version.save()
                 for dependency in module_info['dependencies']:
                     if not Dependency.objects.filter(version=version, dep_module=dependency,
-                                  dep_version=module_info['dependencies'][dependency]).exists():
+                                                     dep_version=module_info['dependencies'][dependency]).exists():
                         dep = Dependency(version=version, dep_module=dependency,
-                                        dep_version=module_info['dependencies'][dependency])
+                                         dep_version=module_info['dependencies'][dependency])
                         dep.save()
             return JsonResponse({'form': True})
         else: