diff --git a/.gitignore b/.gitignore
index b03b2bd..23c6c75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@ __pycache__/
 .vscode/
 venv/
 *.pyc
+.idea
 db.sqlite3
 stderr.log
diff --git a/ACM_Website/settings.py b/ACM_Website/settings.py
index ead6b77..6170e3a 100644
--- a/ACM_Website/settings.py
+++ b/ACM_Website/settings.py
@@ -50,6 +50,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'acm.my_middleware.CustomCorsMiddleware'
 ]
 
 ROOT_URLCONF = 'ACM_Website.urls'
diff --git a/SMP/admin.py b/SMP/admin.py
index 22236db..a9e9beb 100644
--- a/SMP/admin.py
+++ b/SMP/admin.py
@@ -1,6 +1,23 @@
 from django.contrib import admin
-from acm.models import SIG
+from django.urls import path
 from .models import *
+from SMP.views import new_smp
 
-admin.site.register(SMP)
-admin.site.register(SMP_des)
+
+@admin.register(SMP)
+class SMPAdmin(admin.ModelAdmin):
+    def has_add_permission(self, request):
+        return False
+
+    def get_urls(self):
+        urls = super().get_urls()
+        urls = [
+                   path('add_smp/', self.admin_site.admin_view(new_smp))
+               ] + urls
+        return urls
+
+
+@admin.register(SMP_des)
+class SMP_desAdmin(admin.ModelAdmin):
+    def has_add_permission(self, request):
+        return False
diff --git a/SMP/templates/admin/index.html b/SMP/templates/admin/index.html
new file mode 100644
index 0000000..bfbfb62
--- /dev/null
+++ b/SMP/templates/admin/index.html
@@ -0,0 +1,10 @@
+{% extends "admin/index.html" %}
+
+{% block content %}
+    <ul class="object-tools">
+    <li>
+        <a class="addlink" href="/admin/SMP/smp/add_smp">Add SMP</a>
+    </li>
+    </ul>
+{{ block.super }}
+{% endblock %}
\ No newline at end of file
diff --git a/SMP/templates/smp_form.html b/SMP/templates/smp_form.html
index 5aa7edf..4809e03 100644
--- a/SMP/templates/smp_form.html
+++ b/SMP/templates/smp_form.html
@@ -33,8 +33,6 @@
 {% endblock %}
 {% block content %}
 	<br><br><br><br><br>
-	<!-- If password validation is done, show the SMP form-->
-	{% if validated %}
 	<form action="" method="POST" id="main_content">
 		{% csrf_token %}
 
@@ -47,8 +45,8 @@
 		{% for f in smp_form %}
 			{% if f.name in static_fields %}
 			<div class="container center_div">
-				<div class="form-group row" align="center"> 
-					<label for="{{f.name}}">{{f.name}}</label>	
+				<div class="form-group row" align="center">
+					<label for="{{f.name}}">{{f.name}}</label>
 					<input type="text" class="form-control" name="{{f.name}}" maxlength="{{f.max_length}}" id="{{f.name}}">
 				</div>
 	</div>
@@ -57,16 +55,16 @@
 			{% endif %}
 		{% endfor %}
 
-		{% for field in dynammic_fields %}
-		<div class="container center_div">	
+		{% for field in dynamic_fields %}
+		<div class="container center_div">
 		<h3>{{field}}</h3>
 		</div>
 			{% for f in smp_form %}
 				{% if field in f.name %}
 					{% if f.is_hidden %}
-						<div class="form-group" id="{{f.name}}_div" style="display:none;"> 
+						<div class="form-group" id="{{f.name}}_div" style="display:none;">
 					{% else %}
-						<div class="form-group" id="{{f.name}}_div" > 
+						<div class="form-group" id="{{f.name}}_div" >
 					{% endif %}
 					<div class="container center_div">
 							<label for="{{f.name}}">{{f.label}}</label>
@@ -98,9 +96,9 @@ <h3>Weekly Plan</h3>
 						{% concatenate "Week_" i "_Description" as q %}
 						{% if q in f.name %}
 							{% if f.is_hidden %}
-								<div class="form-group" id="{{f.name}}_div" style="display:none;"> 
+								<div class="form-group" id="{{f.name}}_div" style="display:none;">
 							{% else %}
-								<div class="form-group" id="{{f.name}}_div" > 
+								<div class="form-group" id="{{f.name}}_div" >
 							{% endif %}
 							<div class="container center_div">
 									<label for="{{f.name}}">{{f.label}}</label>
@@ -124,14 +122,6 @@ <h3>Weekly Plan</h3>
 		<button type="submit">Submit</button>
 		</div>
 	<form>
-	<!-- If password validation is not done, show the password form-->
-	{% else %}
-		<form method="POST" action="">
-			{% csrf_token %}
-			{{password_form}}
-			<button type="submit">Submit</button>
-		</form>
-	{% endif %}
 {% endblock %}
 
 
diff --git a/SMP/urls.py b/SMP/urls.py
index a79a5d5..34ad33f 100644
--- a/SMP/urls.py
+++ b/SMP/urls.py
@@ -1,10 +1,8 @@
 from django.urls import path
 from .views import *
-
 app_name = 'SMP'
 urlpatterns = [
     path('', index),
     path('<int:sig_id>/', home),
-    path('<int:sig_id>/<int:smp_id>/', des),
-    path('new-smp/', new_smp, name="new_smp"),
+    path('<int:sig_id>/<int:smp_id>/', des)
 ]
diff --git a/SMP/views.py b/SMP/views.py
index 702a357..205b33b 100644
--- a/SMP/views.py
+++ b/SMP/views.py
@@ -1,11 +1,10 @@
-from django.shortcuts import render
+from django.contrib import messages
+from django.shortcuts import render, redirect
 from .models import *
 from acm.models import *
-from django.http import HttpResponse
+from django.http import JsonResponse
 import json
 from .forms import *
-from django.shortcuts import redirect
-from django.contrib import messages
 
 
 form_links = ["https://forms.gle/D5nX9xEC716RNcey9", "https://forms.gle/j2sXQGktrSXZMoee8", "https://forms.gle/PRFU1w8FvK3bsH9YA", "https://forms.gle/DLQca6S7UM2qqh7j6", "https://forms.gle/ipCJj8NEUfMdmzGs7", "https://forms.gle/gQZkVYJrFiaDDiKm7"]
@@ -16,33 +15,33 @@ def index(request) :
 
 
 def home(request, sig_id):
-    si = SIG.objects.filter(pk=sig_id)
-    sig = si[0]
-    sigo = SIG.objects.all()
-    smps = SMP.objects.filter(sig_id=sig_id)
-    data2= open('staticfiles/acm/json/smp.json',encoding='utf-8').read()
-    data2= json.loads(data2)
-    data = ''
-    for i in range(6):
-        if(int(data2[i]['id']) == sig_id):
-            data = data2[i]
-    contex = {'sig': sig, 'sigo': sigo, 'smps': smps,'data':data, 'link':form_links[sig_id-1]}
-    return render(request, 'spms.html', contex)
+    sig = SIG.objects.filter(pk=sig_id).values('id', 'name', 'image', 'mission_statement', 'vision_statement')[0]
+    sigo = all_sigs()
+    smps = list(SMP
+                .objects
+                .filter(sig_id=sig_id).values('id', 'sig_id', 'name', 'mentors', 'overview', 'platform_of_tutoring'))
+    with open('staticfiles/acm/json/smp.json') as f:
+        data2 = json.loads(f.read())
+        data = ''
+        for i in range(5):
+            if int(data2[i]['id']) == sig_id:
+                data = data2[i]
+    context = {'sig': sig, 'sigo': sigo, 'smps': smps, 'data': data}
+    return JsonResponse(context)
 
 
 def des(request, sig_id, smp_id):
-    smp = (SMP.objects.filter(pk=smp_id))[0]
-    smp_des = SMP_des.objects.filter(smp_id=smp_id)
-    contex = {'smp': smp, 'smp_des': smp_des}
-    return render(request, 'smp_des.html', contex)
+    smp = SMP.objects.filter(pk=smp_id).values('id', 'sig_id', 'name', 'mentors', 'overview', 'platform_of_tutoring')[0]
+    smp_des = list(SMP_des.objects.filter(smp_id=smp_id).values('id', 'smp_id', 'sub_heading', 'sub_des'))
+    context = {'smp': smp, 'smp_des': smp_des}
+    return JsonResponse(context)
 
 
 def new_smp(request):
     validated = 0
     static_fields = ['Name', 'Mentors', 'Overview', 'Platform']
-    dynammic_fields = ['Exercise', 'Prerequisite', 'Course-content']
+    dynamic_fields = ['Exercise', 'Prerequisite', 'Course-content']
     if request.method == "POST":
-        password_form = PasswordForm(request.POST)
         smp_form = SMPForm(request.POST)
         if smp_form.is_valid():
             sig = smp_form.cleaned_data["SIG"]
@@ -51,47 +50,44 @@ def new_smp(request):
             overview = smp_form.cleaned_data["Overview"]
             platform = smp_form.cleaned_data["Platform"]
             SMP_object = SMP.objects.create(
-                sig_id=SIG.objects.get(pk=sig), name=name, mentors=mentors, overview=overview, platform_of_tutoring=platform)
+                sig_id=SIG.objects.get(pk=sig), name=name, mentors=mentors, overview=overview,
+                platform_of_tutoring=platform)
             SMP_object.save()
 
-            for field in dynammic_fields:
+            for field in dynamic_fields:
                 for i in range(smp_form.cleaned_data[field.lower() + "_freq"]):
-                    des = smp_form.cleaned_data[field+'_' + str(i+1)]
+                    des = smp_form.cleaned_data[field + '_' + str(i + 1)]
                     if des:
                         SMP_des_object = SMP_des.objects.create(
                             smp_id=SMP_object, sub_heading=field, sub_des=des)
                         SMP_des_object.save()
 
             for i in range(smp_form.cleaned_data["week_freq"]):
-                for j in range(smp_form.cleaned_data["week_"+str(i+1)+"_description_freq"]):
+                for j in range(smp_form.cleaned_data["week_" + str(i + 1) + "_description_freq"]):
                     des = smp_form.cleaned_data["Week_" +
-                                                str(i+1)+"_Description_"+str(j+1)]
+                                                str(i + 1) + "_Description_" + str(j + 1)]
                     if des:
                         SMP_des_object = SMP_des.objects.create(
-                            smp_id=SMP_object, sub_heading="Week "+str(i+1), sub_des=des)
+                            smp_id=SMP_object, sub_heading="Week " + str(i + 1), sub_des=des)
                         SMP_des_object.save()
 
             messages.success(request, "SMP created")
             return redirect('acm:home_page')
 
-        if password_form.is_valid():
-            # To be hidden somehow
-            if password_form.cleaned_data["key"] == "s@ng@madethiz":
-                validated = 1
-            else:
-                messages.MessageFailure(request, 'Incorrect password')
-
     else:
-        password_form = PasswordForm()
         smp_form = SMPForm()
 
     sigo = SIG.objects.all()
-    context = {'password_form': password_form,
-               'smp_form': smp_form,
+    context = {'smp_form': smp_form,
                'validated': validated,
                'static_fields': static_fields,
-               'dynammic_fields': dynammic_fields,
+               'dynamic_fields': dynamic_fields,
                'range_of_8': [1, 2, 3, 4, 5, 6, 7, 8],
                'sigo': sigo, }
 
     return render(request, 'smp_form.html', context)
+
+
+# Common block
+def all_sigs():
+    return list(SIG.objects.all().values('id', 'name', 'image', 'mission_statement', 'vision_statement'))
diff --git a/acm/admin.py b/acm/admin.py
index 78b7b53..751646a 100644
--- a/acm/admin.py
+++ b/acm/admin.py
@@ -9,3 +9,4 @@
 admin.site.register(Projects)
 admin.site.register(Special_people)
 admin.site.register(Proposals)
+admin.site.register(ProposalTimeline)
diff --git a/acm/middleware/__init__.py b/acm/middleware/__init__.py
new file mode 100644
index 0000000..494f83d
--- /dev/null
+++ b/acm/middleware/__init__.py
@@ -0,0 +1 @@
+from . import corsMiddleware
\ No newline at end of file
diff --git a/acm/middleware/corsMiddleware.py b/acm/middleware/corsMiddleware.py
new file mode 100644
index 0000000..86d2012
--- /dev/null
+++ b/acm/middleware/corsMiddleware.py
@@ -0,0 +1,9 @@
+class corsMiddleware(object):
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        response = self.get_response(request)
+        response["Access-Control-Allow-Origin"] = "*"
+
+        return response
\ No newline at end of file
diff --git a/acm/migrations/0015_add_image_to_events.py b/acm/migrations/0015_add_image_to_events.py
new file mode 100644
index 0000000..3658b23
--- /dev/null
+++ b/acm/migrations/0015_add_image_to_events.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.0 on 2021-08-05 06:12
+import django
+from django.core.validators import FileExtensionValidator
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('acm', '0014_projects_knowledge'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='Events',
+            name='image',
+            field=models.ImageField(upload_to='uploads/events', blank=True, null=True, validators=[
+                FileExtensionValidator(['jpg', 'jpeg', 'png'])]),
+        ),
+        migrations.AlterField(
+            model_name='Events',
+            name='sig_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='acm.SIG', null=True)
+        )
+    ]
diff --git a/acm/migrations/0016_alter_special_people.py b/acm/migrations/0016_alter_special_people.py
new file mode 100644
index 0000000..ffa355b
--- /dev/null
+++ b/acm/migrations/0016_alter_special_people.py
@@ -0,0 +1,49 @@
+# Generated by Django 2.0 on 2021-08-07 06:57
+from django.core.validators import FileExtensionValidator
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('acm', '0015_add_image_to_events'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='Special_people',
+            old_name='fb_link',
+            new_name='email_link'
+        ),
+        migrations.RemoveField(
+            model_name='Proposals',
+            name='members'
+        ),
+        migrations.AddField(
+            model_name='Proposals',
+            name='learning_outcomes',
+            field=models.TextField(blank=True)
+        ),
+        migrations.AddField(
+            model_name='Proposals',
+            name='results',
+            field=models.TextField(blank=True)
+        ),
+        migrations.AddField(
+            model_name='Proposals',
+            name='image',
+            field=models.ImageField(upload_to='uploads/proposals', blank=True, null=True, validators=[
+                FileExtensionValidator(['jpg', 'jpeg', 'png'])]),
+        ),
+        migrations.CreateModel(
+            name='ProposalTimeline',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('phase', models.TextField(blank=True)),
+                ('tasks', models.TextField(blank=True)),
+                ('start_date', models.DateField(blank=True)),
+                ('end_date', models.DateField(blank=True)),
+                ('proposal_id', models.ForeignKey(on_delete=models.deletion.CASCADE, to='acm.Proposals'))
+            ]
+        )
+    ]
diff --git a/acm/models.py b/acm/models.py
index fc97451..b07a2d3 100644
--- a/acm/models.py
+++ b/acm/models.py
@@ -1,79 +1,99 @@
 from django.db import models
 from django.core.validators import FileExtensionValidator
+
+
 # Create your models here.
 
 
 class SIG(models.Model):
- name = models.CharField(max_length=200)
- image = models.ImageField(upload_to='uploads/sigs', blank=True, null=True, validators=[
-     FileExtensionValidator(['jpg', 'jpeg', 'png', ])])
- mission_statement = models.TextField()
- vision_statement = models.TextField()
+    name = models.CharField(max_length=200)
+    image = models.ImageField(upload_to='uploads/sigs', blank=True, null=True, validators=[
+        FileExtensionValidator(['jpg', 'jpeg', 'png', ])])
+    mission_statement = models.TextField()
+    vision_statement = models.TextField()
 
- def __str__(self):
+    def __str__(self):
         return self.name
 
 
 class Events(models.Model):
- sig_id = models.ForeignKey(SIG, on_delete=models.CASCADE)
- name = models.CharField(max_length=200)
- description = models.CharField(max_length=5000)
+    sig_id = models.ForeignKey(SIG, on_delete=models.CASCADE, null=True)
+    name = models.CharField(max_length=200)
+    description = models.CharField(max_length=5000)
+    image = models.ImageField(upload_to='uploads/events', blank=True, null=True, validators=[
+        FileExtensionValidator(['jpg', 'jpeg', 'png', ])])
 
- def __str__(self):
+    def __str__(self):
         return self.name
 
 
 class Projects(models.Model):
- sig_id = models.ForeignKey(SIG, on_delete=models.CASCADE)
- name = models.CharField(max_length=200)
- display_picture = models.ImageField(upload_to='uploads/projects', blank=True, null=True, validators=[
-                                     FileExtensionValidator(['jpg', 'jpeg', 'png', ])])
- duration_in_months = models.IntegerField(blank=True)
- mentors = models.TextField(blank=True)
- members = models.TextField(blank=True)
- introduction = models.TextField(blank=True)
- method = models.TextField(blank=True)
- results = models.TextField(blank=True)
- obstacles = models.TextField(blank=True)
- conclusion = models.TextField(blank=True)
- future_work = models.TextField(blank=True)
- references = models.TextField(blank=True)
- knowledge = models.TextField(blank=True)
- meet_link = models.CharField(max_length=500, blank=True)
- year = models.IntegerField()
-
- def __str__(self):
+    sig_id = models.ForeignKey(SIG, on_delete=models.CASCADE)
+    name = models.CharField(max_length=200)
+    display_picture = models.ImageField(upload_to='uploads/projects', blank=True, null=True, validators=[
+        FileExtensionValidator(['jpg', 'jpeg', 'png', ])])
+    duration_in_months = models.IntegerField(blank=True)
+    mentors = models.TextField(blank=True)
+    members = models.TextField(blank=True)
+    introduction = models.TextField(blank=True)
+    method = models.TextField(blank=True)
+    results = models.TextField(blank=True)
+    obstacles = models.TextField(blank=True)
+    conclusion = models.TextField(blank=True)
+    future_work = models.TextField(blank=True)
+    references = models.TextField(blank=True)
+    knowledge = models.TextField(blank=True)
+    meet_link = models.CharField(max_length=500, blank=True)
+    year = models.IntegerField()
+
+    def __str__(self):
         return self.name
 
+
 class Proposals(models.Model):
     sig_id = models.ForeignKey(SIG, on_delete=models.CASCADE)
     name = models.CharField(max_length=200)
     duration_in_months = models.IntegerField(blank=True)
     mentors = models.TextField(blank=True)
-    members = models.TextField(blank=True)
     introduction = models.TextField(blank=True)
     method = models.TextField(blank=True)
     existing_work = models.TextField(blank=True)
+    learning_outcomes = models.TextField(blank=True)
+    results = models.TextField(blank=True)
+    image = models.ImageField(upload_to='uploads/proposals', blank=True, null=True, validators=[
+        FileExtensionValidator(['jpg', 'jpeg', 'png'])])
 
     application = models.TextField(blank=True)
     references = models.TextField(blank=True)
+
     def __str__(self):
         return self.name
 
 
+class ProposalTimeline(models.Model):
+    proposal_id = models.ForeignKey(Proposals, on_delete=models.CASCADE)
+    phase = models.TextField(blank=True)
+    tasks = models.TextField(blank=True)
+    start_date = models.DateField(blank=True)
+    end_date = models.DateField(blank=True)
+
+    def __str__(self):
+        return "Proposal_Timeline #%d" % self.id
+
+
 class ProjectPictures(models.Model):
- project_id = models.ForeignKey(Projects, on_delete=models.CASCADE)
- picture = models.ImageField(upload_to='uploads/projects', blank=True, null=True,
-                             validators=[FileExtensionValidator(['jpg', 'jpeg', 'png', ])])
- title = models.TextField(blank=True)
+    project_id = models.ForeignKey(Projects, on_delete=models.CASCADE)
+    picture = models.ImageField(upload_to='uploads/projects', blank=True, null=True,
+                                validators=[FileExtensionValidator(['jpg', 'jpeg', 'png', ])])
+    title = models.TextField(blank=True)
 
 
 class Special_people(models.Model):
- name = models.CharField(max_length=30)  # As only first name is mentioned
- post = models.CharField(max_length=25)
- fb_link = models.CharField(max_length=500)
- linkedin_link = models.CharField(max_length=500)
- image_path = models.CharField(max_length=200)
+    name = models.CharField(max_length=30)  # As only first name is mentioned
+    post = models.CharField(max_length=25)
+    email_link = models.CharField(max_length=500)
+    linkedin_link = models.CharField(max_length=500)
+    image_path = models.CharField(max_length=200)
 
- def __str__(self):
+    def __str__(self):
         return self.name
diff --git a/acm/my_middleware.py b/acm/my_middleware.py
new file mode 100644
index 0000000..aabfd1b
--- /dev/null
+++ b/acm/my_middleware.py
@@ -0,0 +1,16 @@
+class CustomCorsMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+        # One-time configuration and initialization.
+
+    def __call__(self, request):
+        # Code to be executed for each request before
+        # the view (and later middleware) are called.
+
+        response = self.get_response(request)
+        response["Access-Control-Allow-Origin"] = "*"
+        response["Access-Control-Allow-Headers"] = "*"
+        # Code to be executed for each request/response after
+        # the view is called.
+
+        return response
\ No newline at end of file
diff --git a/acm/urls.py b/acm/urls.py
index be1244d..3911d39 100644
--- a/acm/urls.py
+++ b/acm/urls.py
@@ -20,4 +20,5 @@
     path('events/update/<int:event_id>/',update_event),
     path('projects/update/<int:project_id>/',update_project),
     path('<str:type>/delete/<int:id>/',delete_component),
+    path('events/club_events', club_events)
 ]
diff --git a/acm/views.py b/acm/views.py
index 830a556..2bc049a 100644
--- a/acm/views.py
+++ b/acm/views.py
@@ -1,265 +1,292 @@
-from django.shortcuts import render
+from django.contrib.auth.hashers import make_password
+from django.views.decorators.csrf import csrf_exempt
+import os
+
 from .models import *
 from SMP.models import *
 import json
-from django.http import HttpResponse
+from django.http import JsonResponse
 from .forms import *
-from django.contrib import messages
-from django.shortcuts import redirect
+
 
 def home_page(request):
-    events = Events.objects.all()
-    special_people = Special_people.objects.all()
+    events = list(Events.objects.all().values('id', 'sig_id', 'name', 'description', 'image'))
+    special_people = list(
+        Special_people.objects.all().values('id', 'name', 'post', 'email_link', 'linkedin_link', 'image_path'))
 
     # opens the json file and saves the raw contents
-    data = open('staticfiles/acm/json/index.json',encoding='utf-8').read()
-    descriptions = json.loads(data)
-    sigo = SIG.objects.all()
-    context = {'events': events,'sigo': sigo, 'descriptions':descriptions,'special_people':special_people}
-    return render(request, 'acm/index.html', context)
+    sigo = all_sigs()
+    context = {'events': events, 'special_people': special_people, 'sigo': sigo}
+    return JsonResponse(context)
 
 
 def load_sig_contents(sig_id):
-    si = SIG.objects.filter(pk=sig_id)
-    sig = si[0]
-    sigo = SIG.objects.all()
-    events = Events.objects.filter(sig_id=sig_id)
-    projects = Projects.objects.filter(sig_id=sig_id)
+    sig = SIG.objects.filter(pk=sig_id).values('id', 'name', 'image', 'mission_statement', 'vision_statement')[0]
+    sigo = all_sigs()
+    events = list(Events.objects.filter(sig_id=sig_id).values('id', 'sig_id', 'name', 'description', 'image'))
+    projects = list(Projects.objects.filter(sig_id=sig_id)
+                    .values('id', 'name', 'display_picture', 'duration_in_months', 'mentors',
+                            'members', 'introduction', 'method', 'results', 'obstacles',
+                            'conclusion', 'future_work', 'references', 'meet_link', 'year'))
     with open('staticfiles/acm/json/yantras.json') as f:
         data2 = json.loads(f.read())
-        data =''
-        x=len(sigo)
-        for i in range (x):
-            if(data2[i]['id']==sig_id):
-                data=data2[i]
+        data = ''
+        for i in range(len(sigo)):
+            if data2[i]['id'] == sig_id:
+                data = data2[i]
     return sig, events, projects, sigo, data
 
+
 def sig_page(request, sig_id):
-    sig, events, _, sigo, data = load_sig_contents(sig_id)
-    context = {'sig': sig, 'events': events, 'sigo': sigo , 'data':data}
-    return render(request, 'acm/yantras.html', context)
+    sig, events, projects, sigo, data = load_sig_contents(sig_id)
+    context = {'sig': sig, 'events': events,
+               'projects': projects, 'sigo': sigo, 'data': data}
+    return JsonResponse(context)
+
 
 def expo_index(request):
-    context = {'sigo': SIG.objects.all()}
-    return render(request, 'acm/expo_index.html', context)
+    context = {'sigo': all_sigs()}
+    return JsonResponse(context)
+
 
 def expo_year_wise(request, sig_id, year):
     sig, _, projects, sigo, data = load_sig_contents(sig_id)
-    projects = projects.filter(year=year)
+    projects = list(filter(lambda x: x['year'] == year, projects))
     context = {'projects': projects,
                'sigo': sigo,
-                'sig': sig}
+               'sig': sig}
+
+    return JsonResponse(context)
 
-    return render(request, 'acm/expo.html', context)
 
 def expo(request, sig_id):
     return expo_year_wise(request, sig_id, 2020)
 
+
 def project(request, project_id):
-    context = {'project': Projects.objects.get(id=project_id),
-               'sigo': SIG.objects.all(),
-               'pictures': ProjectPictures.objects.filter(project_id=project_id)}
-    return render(request, 'acm/project.html', context)
+    context = {'project': Projects.objects.filter(id=project_id)
+        .values('id', 'name', 'display_picture', 'duration_in_months', 'mentors',
+                'members', 'introduction', 'method', 'results', 'obstacles',
+                'conclusion', 'future_work', 'references', 'meet_link')[0],
+               'sigo': all_sigs(),
+               'pictures': list(ProjectPictures.objects.filter(project_id=project_id)
+                                .values('id', 'project_id', 'picture', 'title'))}
+    return JsonResponse(context)
+
 
 def proposal_index(request):
-    context = {'sigo': SIG.objects.all()}
-    return render(request, 'acm/proposal_index.html', context)
+    context = {'sigo': all_sigs()}
+    return JsonResponse(context)
+
 
 def all_proposals(request, sig_id):
-    context = {'projects': Proposals.objects.filter(sig_id = sig_id),
-               'sigo': SIG.objects.all(),
-               'sig': SIG.objects.get(id=sig_id)}
+    context = {'projects': list(Proposals.objects.filter(sig_id=sig_id)
+                                .values('id', 'sig_id', 'name', 'duration_in_months', 'mentors', 'introduction',
+                                        'method', 'existing_work', 'application', 'references', 'learning_outcomes',
+                                        'results', 'image')),
+               'sigo': all_sigs(),
+               'sig':
+                   SIG.objects.filter(id=sig_id).values('id', 'name', 'image', 'mission_statement', 'vision_statement')[
+                       0]
+               }
+
+    return JsonResponse(context)
 
-    return render(request, 'acm/all_proposals.html', context)
 
 def proposal(request, proposal_id):
-    print(proposal_id)
-    context = {'project': Proposals.objects.get(id=proposal_id),
-               'sigo': SIG.objects.all()}
+    context = {'project': Proposals.objects.filter(id=proposal_id)
+        .values('id', 'sig_id', 'name', 'duration_in_months', 'mentors', 'introduction',
+                'method', 'existing_work', 'application', 'references', 'learning_outcomes', 'results', 'image')[0],
+               'sigo': all_sigs(),
+               'timelines': list(ProposalTimeline.objects.filter(proposal_id=proposal_id)
+                                 .values('id', 'proposal_id', 'phase', 'tasks', 'start_date', 'end_date'))
+               }
+
+    return JsonResponse(context)
 
-    return render(request,'acm/proposal.html', context)
 
 def manage(request, sig_id):
     sig, events, projects, sigo, data = load_sig_contents(sig_id)
     context = {'sig': sig, 'events': events,
-               'projects': projects, 'sigo': sigo , 'data':data, 'smps':SMP.objects.filter(sig_id=sig_id)}
-    return render(request, 'acm/manage.html', context)
+               'projects': projects, 'sigo': sigo, 'data': data,
+               'smps':
+                   list(SMP.objects
+                        .filter(sig_id=sig_id).values('id', 'sig_id', 'name', 'mentors', 'overview',
+                                                      'platform_of_tutoring'))
+               }
+    return JsonResponse(context)
+
 
-def delete_component(request,type,id):
-    valid=0
+@csrf_exempt
+def delete_component(request, type, id):
+    valid = 0
     if request.method == "POST":
-        password_form=PasswordForm(request.POST)
+        request_params = request.body.decode('utf-8')
+        data = json.loads(request_params)
+        password_form = PasswordForm(data)
         if password_form.is_valid():
-            if password_form.cleaned_data["key"] == "s@ng@madethiz":
+            if make_password(password_form.cleaned_data["key"]) == make_password(os.environ["PASSWORD"]):
                 valid = 1
-                if type=="projects":
+                if type == "projects":
                     try:
                         Projects.objects.get(id=id).delete()
-                        messages.success(request, "Project deleted")
+                        return JsonResponse({'message': 'Project successfully deleted'}, status=204)
                     except:
-                        messages.MessageFailure(request, "Couldn't delete project")
-                elif type=="events":
+                        return JsonResponse({'message': "Couldn't delete project"}, status=422)
+                elif type == "events":
                     try:
                         Events.objects.get(id=id).delete()
-                        messages.success(request, "Event deleted")
+                        return JsonResponse({'message': 'Event successfully deleted'}, status=204)
                     except:
-                        messages.MessageFailure(request, "Couldn't delete event")
-                elif type=="smp":
+                        return JsonResponse({'message': "Couldn't delete event"}, status=422)
+                elif type == "smp":
                     try:
                         SMP.objects.get(id=id).delete()
-                        messages.success(request, "SMP deleted")
+                        return JsonResponse({'message': 'SMP successfully deleted'}, status=204)
                     except:
-                        messages.MessageFailure(request, "Couldn't delete SMP")
-                
-                return redirect('acm:home_page')
+                        return JsonResponse({'message': "Couldn't delete SMP"}, status=422)
             else:
-                messages.MessageFailure(request, 'Incorrect password')
+                return JsonResponse({'message': 'Incorrect password'}, status=401)
         else:
-            messages.MessageFailure(request, 'Incorrect password')
-    else:
-        password_form=PasswordForm()
-    sigo = SIG.objects.all()
-    context={ 'sigo':sigo, 'password_form':password_form ,'valid':valid }
-    return render(request,'acm/projects_form.html',context)
+            return JsonResponse({'message': 'Incorrect password'}, status=401)
+    sigo = all_sigs()
+    context = {'sigo': sigo, 'valid': valid}
+    return JsonResponse(context)
 
 
 def contact_us(request):
-    sigo = SIG.objects.all()
+    sigo = all_sigs()
     context = {'sigo': sigo}
-    return render(request, 'acm/contact_us.html', context)
+    return JsonResponse(context)
 
 
 def esp(request):
-    sigo = SIG.objects.all()
+    sigo = all_sigs()
     context = {'sigo': sigo}
-    return render(request, 'acm/esp.html', context)
+    return JsonResponse(context)
+
 
+@csrf_exempt
 def new_project(request):
-    valid=0
+    valid = 0
     if request.method == "POST":
-        project_form=Projectform(request.POST)
-        password_form=PasswordForm(request.POST)
+        request_params = request.body.decode('utf-8')
+        data = json.loads(request_params)
+        project_form = Projectform(data)
+        password_form = PasswordForm(data)
         if project_form.is_valid():
-            sig=project_form.cleaned_data["SIG"]
-            name=project_form.cleaned_data["Name"]
-            des=project_form.cleaned_data["Description"]
-            rep_link=project_form.cleaned_data["Report_link"]
-            pos_link=project_form.cleaned_data["Poster_link"]
-            project_obj=Projects.objects.create(sig_id=SIG.objects.get(pk=sig),name=name,description=des,report_link=rep_link,poster_link=pos_link)
+            sig = project_form.cleaned_data["SIG"]
+            name = project_form.cleaned_data["Name"]
+            des = project_form.cleaned_data["Description"]
+            rep_link = project_form.cleaned_data["Report_link"]
+            pos_link = project_form.cleaned_data["Poster_link"]
+            project_obj = Projects.objects.create(sig_id=SIG.objects.get(pk=sig), name=name, description=des,
+                                                  report_link=rep_link, poster_link=pos_link)
             project_obj.save()
-            messages.success(request, "Project successfully added")
-            return redirect('/acm/')
+            return JsonResponse({'message': 'Project successfully added'}, status=201)
         if password_form.is_valid():
-            if password_form.cleaned_data["key"] == "s@ng@madethiz":
+            if make_password(password_form.cleaned_data["key"]) == make_password(os.environ["PASSWORD"]):
                 valid = 1
             else:
-                messages.MessageFailure(request, 'Incorrect password')   
-    else :
-        password_form=PasswordForm()
-        project_form=Projectform()
-    sigo = SIG.objects.all()
-    context={ 'sigo':sigo, 'project_form':project_form, 'password_form':password_form ,'valid':valid }
-    return render(request,'acm/projects_form.html',context)
+                return JsonResponse({'message': 'Incorrect Password'}, status=401)
+    sigo = all_sigs()
+    context = {'sigo': sigo, 'valid': valid}
+    return JsonResponse(context)
 
+
+@csrf_exempt
 def new_event(request):
-    valid=0
-    if request.method=="POST":
-        event_form=EventsForm(request.POST)
-        password_form=PasswordForm(request.POST)
+    valid = 0
+    if request.method == "POST":
+        request_params = request.body.decode('utf-8')
+        data = json.loads(request_params)
+        event_form = EventsForm(data)
+        password_form = PasswordForm(data)
         if event_form.is_valid():
-            sig=event_form.cleaned_data["SIG"]
-            name=event_form.cleaned_data["Name"]
-            des=event_form.cleaned_data["Description"]
-            event_obj=Events.objects.create(sig_id=SIG.objects.get(pk=sig),name=name,description=des)
+            sig = event_form.cleaned_data["SIG"]
+            name = event_form.cleaned_data["Name"]
+            des = event_form.cleaned_data["Description"]
+            event_obj = Events.objects.create(sig_id=SIG.objects.get(pk=sig), name=name, description=des)
             event_obj.save()
-            messages.success(request, "Event successfully added")
-            return redirect('/acm/')
+            return JsonResponse({'message': 'Event successfully added'}, status=201)
         if password_form.is_valid():
-            if password_form.cleaned_data["key"] == "s@ng@madethiz":
+            if make_password(password_form.cleaned_data["key"]) == make_password(os.environ["PASSWORD"]):
                 valid = 1
             else:
-                messages.MessageFailure(request, 'Incorrect password')
-    else :
-        password_form=PasswordForm()
-        event_form=EventsForm()
-    sigo = SIG.objects.all()
-    context={ 'sigo':sigo, 'event_form':event_form, 'password_form':password_form ,'valid':valid }
-    return render(request,'acm/event_form.html',context)
-
-
-def update_event(request,event_id):
-    valid=0
-    if request.method=="POST":
-        event_form=EventsForm(request.POST)
-        password_form=PasswordForm(request.POST)
+                return JsonResponse({'message': 'Incorrect Password'}, status=401)
+    sigo = all_sigs()
+    context = {'sigo': sigo, 'valid': valid}
+    return JsonResponse(context)
+
+
+@csrf_exempt
+def update_event(request, event_id):
+    valid = 0
+    if request.method == "POST":
+        request_params = request.body.decode('utf-8')
+        data = json.loads(request_params)
+        event_form = EventsForm(data)
+        password_form = PasswordForm(data)
         if event_form.is_valid():
-            sig=event_form.cleaned_data["SIG"]
-            name=event_form.cleaned_data["Name"]
-            des=event_form.cleaned_data["Description"]
-            event_obj=Events.objects.create(sig_id=SIG.objects.get(pk=sig),name=name,description=des)
-            event_obj.save()
-            Events.objects.get(pk=event_id).delete()
-            messages.success(request, "Event successfully added")
-            return redirect('/acm/')
+            sig = event_form.cleaned_data["SIG"]
+            name = event_form.cleaned_data["Name"]
+            des = event_form.cleaned_data["Description"]
+            Events.objects.filter(pk=event_id).update(sig_id=SIG.objects.get(pk=sig), name=name, description=des)
+            return JsonResponse({'message': 'Event successfully updated'}, status=201)
         if password_form.is_valid():
-            if password_form.cleaned_data["key"] == "s@ng@madethiz":
+            if make_password(password_form.cleaned_data["key"]) == make_password(os.environ["PASSWORD"]):
                 valid = 1
             else:
-                messages.MessageFailure(request, 'Incorrect password')
-    else :
-        password_form=PasswordForm()
-    sigo = SIG.objects.all()
+                return JsonResponse({'message': 'Incorrect Password'}, status=401)
+    sigo = all_sigs()
     events = Events.objects.get(pk=event_id)
-    s=[]
-    s.append(events.name)
-    s.append(events.description)
-    event_form=EventsForm(initial={'SIG':events.sig_id})
-    context={ 
-              'sigo':sigo, 
-              'event_form':event_form,
-              'password_form':password_form ,
-              'valid':valid,
-              's':s,
-             }
-    return render(request,'acm/event_form.html',context)
-
-def update_project(request,project_id):
-    valid=0
-    if request.method=="POST":
-        project_form=Projectform(request.POST)
-        password_form=PasswordForm(request.POST)
+    s = [events.id, events.sig_id.id, events.name, events.description]
+    context = {
+        'sigo': sigo,
+        'valid': valid,
+        's': s,
+    }
+    return JsonResponse(context)
+
+
+@csrf_exempt
+def update_project(request, project_id):
+    valid = 0
+    if request.method == "POST":
+        request_params = request.body.decode('utf-8')
+        data = json.loads(request_params)
+        project_form = Projectform(data)
+        password_form = PasswordForm(data)
         if project_form.is_valid():
-            sig=project_form.cleaned_data["SIG"]
-            name=project_form.cleaned_data["Name"]
-            des=project_form.cleaned_data["Description"]
-            rep_link=project_form.cleaned_data["Report_link"]
-            pos_link=project_form.cleaned_data["Poster_link"]
-            project_obj=Projects.objects.create(sig_id=SIG.objects.get(pk=sig),name=name,description=des,report_link=rep_link,poster_link=pos_link)
-            project_obj.save()
-            Projects.objects.get(pk=project_id).delete()
-            messages.success(request, "Project successfully added")
-            return redirect('/acm/')
+            sig = project_form.cleaned_data["SIG"]
+            name = project_form.cleaned_data["Name"]
+            des = project_form.cleaned_data["Description"]
+            rep_link = project_form.cleaned_data["Report_link"]
+            pos_link = project_form.cleaned_data["Poster_link"]
+            Projects.objects.filter(pk=project_id).update(sig_id=SIG.objects.get(pk=sig), name=name, description=des,
+                                                          report_link=rep_link, poster_link=pos_link)
+            return JsonResponse({'message': 'Project successfully updated'})
         if password_form.is_valid():
-            if password_form.cleaned_data['key']=="s@ng@madethiz":
-                valid=1
+            if make_password(password_form.cleaned_data["key"]) == make_password(os.environ["PASSWORD"]):
+                valid = 1
             else:
-                messages.MessageFailure(request,'Incorrect password')
-    else:
-        password_form=PasswordForm()
-    sigo=SIG.objects.all()
-    project=Projects.objects.get(pk=project_id)
-    s=[]
-    s.append(project.name)
-    s.append(project.description)
-    s.append(project.report_link)
-    s.append(project.poster_link)
-    project_form=Projectform(initial={'SIG':project.sig_id})
-    context={ 
-              'sigo':sigo, 
-              'project_form':project_form,
-              'password_form':password_form ,
-              'valid':valid,
-              's':s,
-             }
-    return render(request,'acm/projects_form.html',context)
+                return JsonResponse({'message': 'Incorrect Password'}, status=401)
+    sigo = all_sigs()
+    project = Projects.objects.get(pk=project_id)
+    s = [project.id, project.sig_id.id, project.name, project.description, project.report_link, project.poster_link]
+    context = {
+        'sigo': sigo,
+        'valid': valid,
+        's': s,
+    }
+    return JsonResponse(context)
+
+
+def club_events(request):
+    context = {'events': list(Events.objects.filter(sig_id=None).values('id', 'name', 'description', 'image'))}
+    return JsonResponse(context)
+
 
+# Common block
+def all_sigs():
+    return list(SIG.objects.all().values('id', 'name', 'image', 'mission_statement', 'vision_statement'))
diff --git a/req.txt b/req.txt
new file mode 100644
index 0000000..8823cc6
--- /dev/null
+++ b/req.txt
@@ -0,0 +1,86 @@
+appdirs==1.4.4
+apturl==0.5.2
+attrs==19.3.0
+bitfinex==0.2.6
+blinker==1.4
+Brlapi==0.7.0
+cached-property==1.5.1
+certifi==2019.11.28
+chardet==3.0.4
+Click==7.0
+colorama==0.4.3
+command-not-found==0.3
+cryptography==2.8
+cupshelpers==1.0
+Cython==0.29.14
+dbus-python==1.2.16
+defer==1.0.6
+distlib==0.3.1
+distro==1.4.0
+distro-info===0.23ubuntu1
+Django==2.2
+django-six==1.0.4
+docker==4.1.0
+docker-compose==1.25.0
+dockerpty==0.4.1
+docopt==0.6.2
+entrypoints==0.3
+filelock==3.0.12
+httplib2==0.14.0
+httpretty==0.9.7
+idna==2.8
+importlib-metadata==1.5.0
+jsonschema==3.2.0
+keyring==18.0.1
+language-selector==0.1
+launchpadlib==1.10.13
+lazr.restfulclient==0.14.2
+lazr.uri==1.0.3
+louis==3.12.0
+macaroonbakery==1.3.1
+more-itertools==4.2.0
+netifaces==0.10.4
+numpy==1.17.4
+oauthlib==3.1.0
+olefile==0.46
+pexpect==4.6.0
+Pillow==7.0.0
+protobuf==3.6.1
+pycairo==1.16.2
+pycups==1.9.73
+PyGObject==3.36.0
+PyJWT==1.7.1
+pymacaroons==0.13.0
+PyNaCl==1.3.0
+pyRFC3339==1.1
+pyrsistent==0.15.5
+pystan==2.19.1.1
+python-apt==2.0.0+ubuntu0.20.4.4
+python-dateutil==2.7.3
+python-debian===0.1.36ubuntu1
+python-mbedtls==1.5.1
+pytz==2019.3
+pyxdg==0.26
+PyYAML==5.3.1
+reportlab==3.5.34
+requests==2.22.0
+requests-unixsocket==0.2.0
+SecretStorage==2.3.1
+selenium==3.141.0
+simplejson==3.16.0
+six==1.13.0
+sqlparse==0.3.0
+systemd-python==234
+texttable==1.6.2
+ubuntu-advantage-tools==20.3
+ubuntu-drivers-common==0.0.0
+ufw==0.36
+unattended-upgrades==0.1
+urllib3==1.25.7
+virtualenv==20.4.2
+wadllib==1.3.3
+websocket-client==0.53.0
+xkit==0.0.0
+xlwt==1.3.0
+zipp==1.0.0
+
diff --git a/requirements.txt b/requirements.txt
index 71784a6..c859b26 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,5 @@ six==1.13.0
 sqlparse==0.3.0
 urllib3==1.25.7
 xlwt==1.3.0
-Pillow==7.2.0
\ No newline at end of file
+Pillow==7.2.0
+numpy==1.19.5
\ No newline at end of file