diff --git a/hackathon/forms.py b/hackathon/forms.py
index 8603735e..56f5a0ee 100644
--- a/hackathon/forms.py
+++ b/hackathon/forms.py
@@ -1,6 +1,8 @@
 from django import forms
-from .models import Hackathon
 
+from accounts.models import Organisation
+from .models import Hackathon
+from .lists import STATUS_TYPES_CHOICES, JUDGING_STATUS_CHOICES
 
 class HackathonForm(forms.ModelForm):
     """ A form to enable users to add hackathon events via the frontend site.
@@ -25,8 +27,7 @@ class HackathonForm(forms.ModelForm):
                 'rows': 3,
                 'placeholder': 'Tell us more about this event...'
             }
-        ),
-        required=True
+        )
     )
     theme = forms.CharField(
         label='Theme',
@@ -63,7 +64,27 @@ class HackathonForm(forms.ModelForm):
             }
         ),
     )
+    status = forms.CharField(
+        label="Status",
+        required=True,
+        widget=forms.Select(choices=STATUS_TYPES_CHOICES),
+    ),
+    judging_status = forms.CharField(
+        label="Judging Status",
+        required=True,
+        widget=forms.Select(choices=JUDGING_STATUS_CHOICES),
+    ),
+    organisation = forms.ModelChoiceField(
+        label="Organisation",
+        queryset=Organisation.objects.order_by('display_name'),
+    ),
 
     class Meta:
         model = Hackathon
-        fields = ['display_name', 'description', 'theme', 'start_date', 'end_date']
+        fields = ['display_name', 'description', 'theme', 'start_date',
+                  'end_date', 'status', 'judging_status', 'organisation',
+                  ]
+
+    def __init__(self, *args, **kwargs):
+        super(HackathonForm, self).__init__(*args, **kwargs)
+        self.fields['organisation'].empty_label = None
diff --git a/hackathon/templates/hackathon/create-event.html b/hackathon/templates/hackathon/create-event.html
index ff3bc822..e6a50881 100644
--- a/hackathon/templates/hackathon/create-event.html
+++ b/hackathon/templates/hackathon/create-event.html
@@ -34,6 +34,15 @@ <h1>Create Hackathon</h1>
         <div class="col-12">
           {{ form.theme|as_crispy_field }}
         </div>
+        <div class="col-12">
+          {{ form.organisation|as_crispy_field }}
+        </div>
+        <div class="col-12 col-md-6">
+          {{ form.status|as_crispy_field }}
+        </div>
+        <div class="col-12 col-md-6">
+          {{ form.judging_status|as_crispy_field }}
+        </div>
         <div class="col-12 col-md-6">
           {{ form.start_date|as_crispy_field }}
         </div>
diff --git a/hackathon/templates/hackathon/includes/hackathon_card.html b/hackathon/templates/hackathon/includes/hackathon_card.html
index 50469980..c69bd28d 100644
--- a/hackathon/templates/hackathon/includes/hackathon_card.html
+++ b/hackathon/templates/hackathon/includes/hackathon_card.html
@@ -1,10 +1,11 @@
 <article class="card shadow hack-card">
   <div class="card-body">
-    <h5 class="p-orange card-title">{{ hackathon.display_name }}</h5>
+    <h5 class="p-orange card-title">{{ hackathon.display_name }} {% if user.user_type != 'participant' %}<span class="badge badge-secondary ml-2">{{hackathon.status}}</span> {% endif %}</h5>
     <p class="card-subtitle mb-2 text-muted"><i class="far fa-calendar-alt p-2"></i> {{ hackathon.start_date }} - {{ hackathon.end_date }}</p>
-    <p class="card-text"><i class="fas fa-info-circle p-2"></i> {{ hackathon.description }}</p>
-    {% if hackathon.organiser %}
-      <p><span class="pr-2">Organiser:</span> <a href="#" class="card-link"><span class="dark-text">{{ hackathon.organiser }}</span></a></p>
+    <p class="card-subtitle mb-2 text-muted"><i class="fas fa-building p-2"></i> Organised for {{ hackathon.organisation }}</p>
+    {% if user.user_type != 'participant' %}
+    <p class="card-subtitle mb-2">
+      <i class="fas fa-users p-2"></i>Participants: {{ hackathon.participants.all|length }} / Teams: {{ hackathon.teams.all|length }}</p>
     {% endif %}
     <a href="{% url 'hackathon:view_hackathon' hackathon.id %}" class="btn btn-ci mr-3">Read More</a>
 
diff --git a/hackathon/views.py b/hackathon/views.py
index 9b6e3246..9b9d9c24 100644
--- a/hackathon/views.py
+++ b/hackathon/views.py
@@ -150,7 +150,7 @@ def create_hackathon(request):
             return redirect("hackathon:hackathon-list")
 
         template = "hackathon/create-event.html"
-        form = HackathonForm()
+        form = HackathonForm(initial={'organisation': 1})
 
         return render(request, template, {"form": form})
 
@@ -178,6 +178,7 @@ def create_hackathon(request):
         # Submit form and save record
         if form.is_valid():
             form.instance.created_by = request.user
+            form.instance.organiser = request.user
             form.save()
             messages.success(
                 request, 'Thanks for submitting a new Hackathon event!')
diff --git a/home/templates/home/index.html b/home/templates/home/index.html
index a62a0c8c..9840935f 100644
--- a/home/templates/home/index.html
+++ b/home/templates/home/index.html
@@ -5,39 +5,37 @@
 
     <div class="row landing-page">
         <div class = "col-12 col-sm-12  col-md-12 col-lg-6 " id="accordion-wrapper">
+            {% if hackathons %}
             <h1 class="text-center mt-4">Upcoming Hackathons</h1>
             <div class="accordion" id="accordion-upcoming-hackathons">
-                {% if hackathons %}
-                    {% for hackathon in hackathons %}
-                        {% if hackathon.status == 'published' or user == hackathon.created_by %}
-                            {% if hackathon.organisation.id == 1 or hackathon.organisation == user.organisation %}
-                                {% if not hackathon.status == 'deleted' %}
-                                <div class="card">
-                                    <div class="card-header" id="heading-{{ hackathon.id }}">
-                                        <span class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapse-{{ hackathon.id }}" aria-expanded="true" aria-controls="collapse-{{ hackathon.id }}">
-                                            <h5 class="card-title"><i class="fas fa-caret-down"></i> {{ hackathon.display_name }}</h5>
-                                        </span>
-                                    </div>
-                                    <div id="collapse-{{ hackathon.id }}" class="collapse" aria-labelledby="heading-{{ hackathon.id }}" data-parent="#accordion-upcoming-hackathons">
-                                        <div class="card-body">
-                                        
-                                            <h6 class="card-subtitle mb-2 text-muted"><span class="drk-txt-hkth">Start: </span>{{ hackathon.start_date }} - <span class="drk-txt-hkth">End: </span>{{ hackathon.end_date }}</h6>
-                                                <p class="card-text">{{ hackathon.description }}</p>
-                                            {% if hackathon.organiser %}
-                                            <p><span class="drk-txt-hkth">Organiser: </span><a href="#" class="p-blue card-link">{{ hackathon.organiser }}</a></p>
-                                            {% endif %}
-                                            <a href="{% url 'hackathon:view_hackathon' hackathon.id %}" class="btn btn-ci mr-3">Read More</a>
-                                        </div>
-                                    </div>
+            {% for hackathon in hackathons %}
+                {% if hackathon.status == 'published' %}
+                    {% if hackathon.organisation.id == 1 or hackathon.organisation == user.organisation %}
+                        {% if not hackathon.status == 'deleted' %}
+                        <div class="card">
+                            <div class="card-header" id="heading-{{ hackathon.id }}">
+                                <span class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapse-{{ hackathon.id }}" aria-expanded="true" aria-controls="collapse-{{ hackathon.id }}">
+                                    <h5 class="card-title"><i class="fas fa-caret-down"></i> {{ hackathon.display_name }}</h5>
+                                </span>
+                            </div>
+                            <div id="collapse-{{ hackathon.id }}" class="collapse" aria-labelledby="heading-{{ hackathon.id }}" data-parent="#accordion-upcoming-hackathons">
+                                <div class="card-body">
+                                    <h6 class="card-subtitle mb-2 text-muted"><span class="drk-txt-hkth">Start: </span>{{ hackathon.start_date }} - <span class="drk-txt-hkth">End: </span>{{ hackathon.end_date }}</h6>
+                                        <p class="card-text">{{ hackathon.description }}</p>
+                                    {% if hackathon.organiser %}
+                                    <p><span class="drk-txt-hkth">Organiser: </span><a href="#" class="p-blue card-link">{{ hackathon.organiser }}</a></p>
+                                    {% endif %}
+                                    <a href="{% url 'hackathon:view_hackathon' hackathon.id %}" class="btn btn-ci mr-3">Read More</a>
                                 </div>
                             </div>
-                            {% endif %}
+                        </div>
                         {% endif %}
                     {% endif %}
-                {% endfor %}
-                {% else %}
-                <h2 class="text-center">There aren't any Hackathons at the moment!</h2>
                 {% endif %}
+            {% endfor %}
+            {% else %}
+            <h2 class="text-center">There aren't any Hackathons at the moment!</h2>
+            {% endif %}
             </div>
             <div class="project-list">
                 <ol class="list">Project Portfolio
@@ -48,7 +46,6 @@ <h2 class="text-center">There aren't any Hackathons at the moment!</h2>
             </div>
         </div>
         <div class = "col-12 col-sm-12 col-md-12 col-lg-6">
-            
             <div class="card mt-4">
                 <img class="card-img-top" src="{% static 'img/ci-hacking-new-normal--square.png' %}" alt="Code Institute Hackathon Logo">
             </div>
@@ -85,5 +82,4 @@ <h1 class=" text text-center">Submission Showcases</h1>
         </div>
     </div>
 
-
 {% endblock %}