diff --git a/events/admin.py b/events/admin.py
index e5bd295..2b345a0 100644
--- a/events/admin.py
+++ b/events/admin.py
@@ -12,14 +12,21 @@ admin.site.register(Country)
 
 class SPRAdmin(admin.ModelAdmin):
     raw_id_fields = ('country',)
+    list_filter =('country',)
+    search_fields = ('name', 'country__name')
 admin.site.register(SPR, SPRAdmin)
 
 class CityAdmin(admin.ModelAdmin):
     raw_id_fields = ('spr',)
+    list_filter =('spr__country',)
+    search_fields = ('name', 'spr__name')
 admin.site.register(City, CityAdmin)
 
 admin.site.register(UserProfile)
-admin.site.register(Organization)
+
+class OrgAdmin(admin.ModelAdmin):
+    list_display = ('name', 'site')
+admin.site.register(Organization, OrgAdmin)
 
 class TeamAdmin(admin.ModelAdmin):
     raw_id_fields = ('country', 'spr', 'city', 'owner_profile', 'admin_profiles', 'contact_profiles')
diff --git a/events/management/commands/load_cities.py b/events/management/commands/load_cities.py
new file mode 100644
index 0000000..e9e7740
--- /dev/null
+++ b/events/management/commands/load_cities.py
@@ -0,0 +1,56 @@
+from django.core.management.base import BaseCommand, CommandError
+
+from events.models.locale import Country, SPR, City
+
+# Fields from geoname table, from http://download.geonames.org/export/dump/readme.txt
+GEONAMEID=0
+NAME=1
+ASCIINAME=2
+ALTERNATENAMES=3
+LATITUDE=4
+LONGITUDE=5
+FEATURE_CLASS=6
+FEATURE_CODE=7
+COUNTRY_CODE=8
+COUNTRY_CODE_2=9
+ADMIN1=10
+ADMIN2=11
+ADMIN3=12
+ADMIN4=13
+POPULATION=14
+ELEVATION=15
+DIGITAL_ELEVATION=16
+TIMEZONE=17
+MODIFICATION_DATE=18
+
+COUNTRY_CACHE = dict()
+SPR_CACHE = dict()
+
+class Command(BaseCommand):
+    help = 'Loads city data from GeoNames database file'
+
+    def add_arguments(self, parser):
+        parser.add_argument('file', type=str)
+
+    def handle(self, *args, **options):
+        if 'file' in options:
+            # Preload country cache
+            for country in Country.objects.all():
+                COUNTRY_CACHE[country.code] = country
+            for spr in SPR.objects.all():
+                SPR_CACHE["%s.%s"%(spr.country.code, spr.code)] = spr
+            cities_file = open(options['file'], 'r')
+            for city_line in cities_file.readlines():
+                city = city_line.split("\t")
+                if len(city) == 19:
+                    if city[FEATURE_CODE] == "PPL" or city[FEATURE_CODE] == "PPLA":
+                        country = COUNTRY_CACHE.get(city[COUNTRY_CODE])
+                        spr = SPR_CACHE.get("%s.%s"%(city[COUNTRY_CODE], city[ADMIN1]))
+                        if country is not None and spr is not None:
+                            City.objects.get_or_create(name=city[NAME], spr=spr, tz=city[TIMEZONE])
+                else:
+                    print("Short line (%s): %s" % (len(city), city_line))
+            cities_file.close()
+
+        else:
+            print("No File in options!")
diff --git a/events/management/commands/load_countries.py b/events/management/commands/load_countries.py
new file mode 100644
index 0000000..df73af4
--- /dev/null
+++ b/events/management/commands/load_countries.py
@@ -0,0 +1,47 @@
+from django.core.management.base import BaseCommand, CommandError
+
+from events.models.locale import Country
+
+# Fields from geoname table, from http://download.geonames.org/export/dump/readme.txt
+ISO=0
+ISO3=1
+ISO_NUMERIC=2
+FIPS=3
+COUNTRY=4
+CAPITAL=5
+AREA=6
+POPULATION=7
+CONTINENT=8
+TLD=9
+CURRENCYCODE=10
+CURRENCYNAME=11
+PHONE=12
+POSTAL_CODE_FORMAT=13
+POSTAL_CODE_REGEX=14
+LANGUAGES=15
+GEONAMEID=16
+NEIGHBOURS=17
+EQUIVALENTFIPSCODE=18
+
+class Command(BaseCommand):
+    help = 'Loads country data from GeoNames database file'
+
+    def add_arguments(self, parser):
+        parser.add_argument('file', type=str)
+
+    def handle(self, *args, **options):
+        if 'file' in options:
+            countries_file = open(options['file'], 'r')
+            for country_line in countries_file.readlines():
+                if country_line.startswith("#"):
+                    continue
+                country = country_line.split("\t")
+                if len(country) == 19:
+                    #print("%s - %s" % (country[ISO], country[COUNTRY]))
+                    Country.objects.get_or_create(name=country[COUNTRY], code=country[ISO])
+                else:
+                    print("Short line (%s): %s" % (len(country), country_line))
+            countries_file.close()
+
+        else:
+            print("No File in options!")
diff --git a/events/management/commands/load_spr.py b/events/management/commands/load_spr.py
new file mode 100644
index 0000000..61e4de2
--- /dev/null
+++ b/events/management/commands/load_spr.py
@@ -0,0 +1,41 @@
+from django.core.management.base import BaseCommand, CommandError
+
+from events.models.locale import Country, SPR, City
+
+# Fields from geoname table, from http://download.geonames.org/export/dump/readme.txt
+COMBINED_CODE=0
+NAME=1
+ASCIINAME=2
+GEONAMEID=3
+
+COUNTRY_CACHE = dict()
+
+
+class Command(BaseCommand):
+    help = 'Loads spr data from GeoNames database file'
+
+    def add_arguments(self, parser):
+        parser.add_argument('file', type=str)
+
+    def handle(self, *args, **options):
+        if 'file' in options:
+            # Preload country cache
+            for country in Country.objects.all():
+                COUNTRY_CACHE[country.code] = country
+            spr_file = open(options['file'], 'r')
+            for spr_line in spr_file.readlines():
+                if spr_line.startswith("#"):
+                    continue
+                spr = spr_line.split("\t")
+                if len(spr) ==4:
+                    COUNTRY_CODE, SPR_CODE = spr[COMBINED_CODE].split(".")
+                    country = COUNTRY_CACHE.get(COUNTRY_CODE)
+                    if country is not None:
+                        #print("%s - %s, %s" % (SPR_CODE, spr[NAME], country.name))
+                        SPR.objects.get_or_create(name=spr[NAME], code=SPR_CODE, country=country)
+                else:
+                    print("Short line (%s): %s" % (len(spr), spr_line))
+            spr_file.close()
+
+        else:
+            print("No File in options!")
diff --git a/events/migrations/0004_auto_20180103_2212.py b/events/migrations/0004_auto_20180103_2212.py
new file mode 100644
index 0000000..b868476
--- /dev/null
+++ b/events/migrations/0004_auto_20180103_2212.py
@@ -0,0 +1,39 @@
+# Generated by Django 2.0 on 2018-01-03 22:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0003_searchable_tags'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='city',
+            name='tz',
+            field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Timbuktu', 'Africa/Timbuktu'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/ComodRivadavia', 'America/Argentina/ComodRivadavia'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Atka', 'America/Atka'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Ensenada', 'America/Ensenada'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fort_Wayne', 'America/Fort_Wayne'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Knox_IN', 'America/Knox_IN'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montreal', 'America/Montreal'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Acre', 'America/Porto_Acre'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Rosario', 'America/Rosario'), ('America/Santa_Isabel', 'America/Santa_Isabel'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Shiprock', 'America/Shiprock'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Virgin', 'America/Virgin'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/South_Pole', 'Antarctica/South_Pole'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Ashkhabad', 'Asia/Ashkhabad'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Chongqing', 'Asia/Chongqing'), ('Asia/Chungking', 'Asia/Chungking'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Dacca', 'Asia/Dacca'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Harbin', 'Asia/Harbin'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Istanbul', 'Asia/Istanbul'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kashgar', 'Asia/Kashgar'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macao', 'Asia/Macao'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Tel_Aviv', 'Asia/Tel_Aviv'), ('Asia/Thimbu', 'Asia/Thimbu'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ujung_Pandang', 'Asia/Ujung_Pandang'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Ulan_Bator', 'Asia/Ulan_Bator'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Jan_Mayen', 'Atlantic/Jan_Mayen'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/ACT', 'Australia/ACT'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Canberra', 'Australia/Canberra'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/LHI', 'Australia/LHI'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/NSW', 'Australia/NSW'), ('Australia/North', 'Australia/North'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Queensland', 'Australia/Queensland'), ('Australia/South', 'Australia/South'), ('Australia/Sydney', 'Australia/Sydney'), ('Australia/Tasmania', 'Australia/Tasmania'), ('Australia/Victoria', 'Australia/Victoria'), ('Australia/West', 'Australia/West'), ('Australia/Yancowinna', 'Australia/Yancowinna'), ('Brazil/Acre', 'Brazil/Acre'), ('Brazil/DeNoronha', 'Brazil/DeNoronha'), ('Brazil/East', 'Brazil/East'), ('Brazil/West', 'Brazil/West'), ('CET', 'CET'), ('CST6CDT', 'CST6CDT'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Canada/Saskatchewan', 'Canada/Saskatchewan'), ('Canada/Yukon', 'Canada/Yukon'), ('Chile/Continental', 'Chile/Continental'), ('Chile/EasterIsland', 'Chile/EasterIsland'), ('Cuba', 'Cuba'), ('EET', 'EET'), ('EST', 'EST'), ('EST5EDT', 'EST5EDT'), ('Egypt', 'Egypt'), ('Eire', 'Eire'), ('Etc/GMT', 'Etc/GMT'), ('Etc/GMT+0', 'Etc/GMT+0'), ('Etc/GMT+1', 'Etc/GMT+1'), ('Etc/GMT+10', 'Etc/GMT+10'), ('Etc/GMT+11', 'Etc/GMT+11'), ('Etc/GMT+12', 'Etc/GMT+12'), ('Etc/GMT+2', 'Etc/GMT+2'), ('Etc/GMT+3', 'Etc/GMT+3'), ('Etc/GMT+4', 'Etc/GMT+4'), ('Etc/GMT+5', 'Etc/GMT+5'), ('Etc/GMT+6', 'Etc/GMT+6'), ('Etc/GMT+7', 'Etc/GMT+7'), ('Etc/GMT+8', 'Etc/GMT+8'), ('Etc/GMT+9', 'Etc/GMT+9'), ('Etc/GMT-0', 'Etc/GMT-0'), ('Etc/GMT-1', 'Etc/GMT-1'), ('Etc/GMT-10', 'Etc/GMT-10'), ('Etc/GMT-11', 'Etc/GMT-11'), ('Etc/GMT-12', 'Etc/GMT-12'), ('Etc/GMT-13', 'Etc/GMT-13'), ('Etc/GMT-14', 'Etc/GMT-14'), ('Etc/GMT-2', 'Etc/GMT-2'), ('Etc/GMT-3', 'Etc/GMT-3'), ('Etc/GMT-4', 'Etc/GMT-4'), ('Etc/GMT-5', 'Etc/GMT-5'), ('Etc/GMT-6', 'Etc/GMT-6'), ('Etc/GMT-7', 'Etc/GMT-7'), ('Etc/GMT-8', 'Etc/GMT-8'), ('Etc/GMT-9', 'Etc/GMT-9'), ('Etc/GMT0', 'Etc/GMT0'), ('Etc/Greenwich', 'Etc/Greenwich'), ('Etc/UCT', 'Etc/UCT'), ('Etc/UTC', 'Etc/UTC'), ('Etc/Universal', 'Etc/Universal'), ('Etc/Zulu', 'Etc/Zulu'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belfast', 'Europe/Belfast'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Nicosia', 'Europe/Nicosia'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Tiraspol', 'Europe/Tiraspol'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GB', 'GB'), ('GB-Eire', 'GB-Eire'), ('GMT', 'GMT'), ('GMT+0', 'GMT+0'), ('GMT-0', 'GMT-0'), ('GMT0', 'GMT0'), ('Greenwich', 'Greenwich'), ('HST', 'HST'), ('Hongkong', 'Hongkong'), ('Iceland', 'Iceland'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Iran', 'Iran'), ('Israel', 'Israel'), ('Jamaica', 'Jamaica'), ('Japan', 'Japan'), ('Kwajalein', 'Kwajalein'), ('Libya', 'Libya'), ('MET', 'MET'), ('MST', 'MST'), ('MST7MDT', 'MST7MDT'), ('Mexico/BajaNorte', 'Mexico/BajaNorte'), ('Mexico/BajaSur', 'Mexico/BajaSur'), ('Mexico/General', 'Mexico/General'), ('NZ', 'NZ'), ('NZ-CHAT', 'NZ-CHAT'), ('Navajo', 'Navajo'), ('PRC', 'PRC'), ('PST8PDT', 'PST8PDT'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Johnston', 'Pacific/Johnston'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Samoa', 'Pacific/Samoa'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('Pacific/Yap', 'Pacific/Yap'), ('Poland', 'Poland'), ('Portugal', 'Portugal'), ('ROC', 'ROC'), ('ROK', 'ROK'), ('Singapore', 'Singapore'), ('Turkey', 'Turkey'), ('UCT', 'UCT'), ('US/Alaska', 'US/Alaska'), ('US/Aleutian', 'US/Aleutian'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/East-Indiana', 'US/East-Indiana'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Indiana-Starke', 'US/Indiana-Starke'), ('US/Michigan', 'US/Michigan'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('US/Pacific-New', 'US/Pacific-New'), ('US/Samoa', 'US/Samoa'), ('UTC', 'UTC'), ('Universal', 'Universal'), ('W-SU', 'W-SU'), ('WET', 'WET'), ('Zulu', 'Zulu')], default='UTC', help_text='The most commonly used timezone for this Team.', max_length=32, verbose_name='Default Timezone'),
+        ),
+        migrations.AddField(
+            model_name='spr',
+            name='code',
+            field=models.CharField(default='', max_length=8, verbose_name='Admin Code'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='team',
+            name='admin_profiles',
+            field=models.ManyToManyField(blank=True, related_name='admins', to='events.UserProfile'),
+        ),
+        migrations.AlterField(
+            model_name='team',
+            name='contact_profiles',
+            field=models.ManyToManyField(blank=True, related_name='contacts', to='events.UserProfile'),
+        ),
+        migrations.AlterField(
+            model_name='team',
+            name='languages',
+            field=models.ManyToManyField(blank=True, to='events.Language'),
+        ),
+    ]
diff --git a/events/models/events.py b/events/models/events.py
index 742e1cf..ce800ed 100644
--- a/events/models/events.py
+++ b/events/models/events.py
@@ -50,7 +50,11 @@ class Event(models.Model):
     #replies
 
     def get_absolute_url(self):
-        return reverse('show-event', kwargs={'event_id': self.id, 'event_slug': slugify(self.name)})
+        return reverse('show-event', kwargs={'event_id': self.id, 'event_slug': self.slug})
+
+    @property
+    def slug(self):
+        return slugify(self.name)
 
     def __str__(self):
         return u'%s by %s at %s' % (self.name, self.team.name, self.start_time)
diff --git a/events/models/locale.py b/events/models/locale.py
index e3b91c1..889bcd2 100644
--- a/events/models/locale.py
+++ b/events/models/locale.py
@@ -1,6 +1,8 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+import pytz
+
 class Language(models.Model):
     class Meta:
         ordering = ('name',)
@@ -41,6 +43,7 @@ class Country(models.Model):
 
 class SPR(models.Model):
     name = models.CharField(_("Name"), max_length=100)
+    code = models.CharField(_("Admin Code"), max_length=8)
     country = models.ForeignKey(Country, on_delete=models.CASCADE)
 
     class Meta:
@@ -63,6 +66,7 @@ class City(models.Model):
 
     name = models.CharField(_("Name"), max_length=100)
     spr = models.ForeignKey(SPR, on_delete=models.CASCADE)
+    tz = models.CharField(max_length=32, verbose_name=_('Default Timezone'), default='UTC', choices=[(tz, tz) for tz in pytz.all_timezones], blank=False, null=False, help_text=_('The most commonly used timezone for this Team.'))
 
     def __str__(self):
         return u'%s, %s, %s' % (self.name, self.spr.name, self.spr.country.name)
diff --git a/events/models/profiles.py b/events/models/profiles.py
index afa921c..357126a 100644
--- a/events/models/profiles.py
+++ b/events/models/profiles.py
@@ -45,6 +45,19 @@ class UserProfile(models.Model):
         local = self.timezone.localize(dt)
         return local.astimezone(pytz.utc)
 
+    def can_create_event(self, team):
+        if not self.user_id:
+            return False
+        if self.user.is_superuser:
+            return True
+        if team.owner_profile == self:
+            return True
+        if self in team.admin_profiles.all():
+            return True
+        if self in team.contact_profiles.all():
+            return True
+        return False
+
 def get_user_timezone(username):
     # TODO: find a smarter way to get timezone
     return 'UTC'
diff --git a/events/templates/events/event_details.html b/events/templates/events/event_details.html
index 6a0f6e5..7affe44 100644
--- a/events/templates/events/event_details.html
+++ b/events/templates/events/event_details.html
@@ -6,7 +6,7 @@
 	<td><b>Place:</b></td><td>{{ event.place }}</td>
 {% if event.web_url %}
 </tr><tr>
-	<td><b>Website:</b></td><td><a href="{{ event.web_url }}">{{ event.web_url }}</a></td>
+	<td><b>Website:</b></td><td><a href="{{ event.web_url }}" target="_blank">{{ event.web_url }}</a></td>
 {% endif %}
 </tr>
 </table>
diff --git a/events/templates/events/event_list.html b/events/templates/events/event_list.html
index ae9b6f2..55df1aa 100644
--- a/events/templates/events/event_list.html
+++ b/events/templates/events/event_list.html
@@ -3,8 +3,8 @@
     <table border="0" width="960px">
     {% for event in events_list %}
 	<tr>
-		<td><a href="{{ event.get_absolute_url }}">{{ event.name }}</a></td>
-		<td>{{ event.team }}</td>
+		<td><a href="{% url 'show-event' event.id event.slug %}">{{ event.name }}</a></td>
+		<td><a href="{% url 'show-team' event.team.id %}">{{ event.team.name }}</a></td>
 		<td>{{ event.start_time }}</td>
 		<td>{{ event.place }}</td>
 	</tr>
diff --git a/events/templates/events/team_list.html b/events/templates/events/team_list.html
new file mode 100644
index 0000000..d70b9a6
--- /dev/null
+++ b/events/templates/events/team_list.html
@@ -0,0 +1,18 @@
+
+{% if teams_list %}
+    <table border="0" width="960px">
+    {% for team in teams_list %}
+	<tr>
+		<td><a href="{% url 'show-team' team.id %}">{{ team.name }}</a></td>
+		<td>{{ team.country.name|default:'' }}</td>
+		<td>{{ team.spr.name|default:'' }}</td>
+		<td>{{ team.city.name|default:'' }}</td>
+		<td>{{ team.owner_profile }}</td>
+		<td>{{ team.created_time }}</td>
+	</tr>
+    {% endfor %}
+    </table>
+{% else %}
+    <p>No team available.</p>
+{% endif %}
+
diff --git a/get_together/templates/get_together/base.html b/get_together/templates/get_together/base.html
index 26e85a8..fc1c8ac 100644
--- a/get_together/templates/get_together/base.html
+++ b/get_together/templates/get_together/base.html
@@ -1,8 +1,67 @@
-{% if request.user.is_authenticated %}
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="">
+    <meta name="author" content="">
 
-Welcome {{ request.user.username }}
+    <title>Get Together</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.3/css/bootstrap.min.css" integrity="sha384-Zug+QiDoJOrZ5t4lssLdxGhVrurbmBWopoEl+M6BdEfwnCJZtKxi1KgxUyJq13dy" crossorigin="anonymous" rel="stylesheet">
+
+    <!-- Bootstrap style overrides -->
+    <style>
+body {
+  padding-top: 5rem;
+}
+.starter-template {
+  padding: 3rem 1.5rem;
+  text-align: center;
+}
+    </style>
+  </head>
+  <body>
+
+   <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
+      <a class="navbar-brand" href="/">GetTogether</a>
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+
+      <div class="collapse navbar-collapse" id="navbarsExampleDefault">
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item active">
+            <a class="nav-link" href="{% url 'events' %}">Events <span class="sr-only">(current)</span></a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="{% url 'teams' %}">Teams</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link disabled" href="#">Places</a>
+          </li>
+
+        </ul>
+        <ul class="navbar-nav">
+{% if request.user.is_authenticated %}
+<li class="nav-item"><a class="nav-link">Welcome {{ request.user.username }}</a></li>
 {% else %}
+<li class="nav-item"><a class="nav-link" href="/">Signup or Login</a></li>
 {% endif %}
+      </div>
+    </nav>
+
+    <main role="main" class="container">
 
 {% block content %}{% endblock %}
+    </main>
 
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+    <script>window.jQuery || document.write('<script src="../../../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
+    <script src="../../../../assets/js/vendor/popper.min.js"></script>
+    <script src="../../../../dist/js/bootstrap.min.js"></script>  </body>
+</html>
diff --git a/get_together/templates/get_together/create_event.html b/get_together/templates/get_together/create_event.html
index 43f4c2f..c02b114 100644
--- a/get_together/templates/get_together/create_event.html
+++ b/get_together/templates/get_together/create_event.html
@@ -1,12 +1,14 @@
 {% extends "get_together/base.html" %}
 
 {% block content %}
-<h2>Have a Get Together</h2>
+<h2>Plan a Get Together</h2>
 <form action="{% url "create-event" team.id%}" method="post">
 {% csrf_token %}
+<div class="form-group">
 {% include "events/event_form.html" %}
 	<br />
-<input type="submit" value="Announce your Get Together!" />
+<button type="submit" class="btn btn-primary">Announce your Get Together</button>
+</div>
 </form>
 {% endblock %}
 
diff --git a/get_together/templates/get_together/create_team.html b/get_together/templates/get_together/create_team.html
index 3ed19fb..d7c671b 100644
--- a/get_together/templates/get_together/create_team.html
+++ b/get_together/templates/get_together/create_team.html
@@ -6,7 +6,7 @@
 {% csrf_token %}
 {% include "events/team_form.html" %}
 	<br />
-<input type="submit" value="Gather your crew!" />
+<button type="submit" class="btn btn-primary">Gather your Team</button>
 </form>
 {% endblock %}
 
diff --git a/get_together/templates/get_together/events.html b/get_together/templates/get_together/events.html
index f015ce9..17842a5 100644
--- a/get_together/templates/get_together/events.html
+++ b/get_together/templates/get_together/events.html
@@ -1,6 +1,7 @@
 {% extends "get_together/base.html" %}
 
 {% block content %}
+<h4>Upcoming events</h4>
 {% include "events/event_list.html" %}
 {% endblock %}
 
diff --git a/get_together/templates/get_together/index.html b/get_together/templates/get_together/index.html
index 2224f89..3c26679 100644
--- a/get_together/templates/get_together/index.html
+++ b/get_together/templates/get_together/index.html
@@ -4,11 +4,11 @@
 <center>
 <h2>Welcome to Get Together!</h2>
 
-<h3>Login with:</h3>
-<a href="{% url 'social:begin' 'google-oauth2' %}">Google</a><br/>
-<a href="{% url 'social:begin' 'facebook' %}">Facebook</a><br/>
-<a href="{% url 'social:begin' 'twitter' %}">Twitter</a><br/>
-<a href="{% url 'social:begin' 'github' %}">GitHub</a><br/>
+<h3>Login</h3>
+<a class="btn btn-primary" href="{% url 'social:begin' 'google-oauth2' %}">Google</a>&nbsp; &nbsp;
+<a class="btn btn-primary" href="{% url 'social:begin' 'facebook' %}">Facebook</a><br/><br/>
+<a class="btn btn-primary" href="{% url 'social:begin' 'twitter' %}">Twitter</a>&nbsp; &nbsp;
+<a class="btn btn-primary" href="{% url 'social:begin' 'github' %}">GitHub</a><br/>
 <br>
 </center>
 {% endblock %}
diff --git a/get_together/templates/get_together/show_event.html b/get_together/templates/get_together/show_event.html
index 6322aa8..70d49d6 100644
--- a/get_together/templates/get_together/show_event.html
+++ b/get_together/templates/get_together/show_event.html
@@ -3,7 +3,7 @@
 {% block content %}
 <h2>About {{ event.name }}</h2>
 
-<h3>Hosted by <a href="{% url "show-team" team.id %}">{{ team.name }}</a></h3>
+<h4>Hosted by <a href="{% url "show-team" team.id %}">{{ team.name }}</a></h4>
 {% include "events/event_details.html" %}
 
 {% endblock %}
diff --git a/get_together/templates/get_together/show_team.html b/get_together/templates/get_together/show_team.html
index 1662092..7a1c2e6 100644
--- a/get_together/templates/get_together/show_team.html
+++ b/get_together/templates/get_together/show_team.html
@@ -3,11 +3,13 @@
 {% block content %}
 <h2>Welcome to {{ team.name }}</h2>
 
-<h3>Upcoming Events</h3>
+<h4>Upcoming Events</h4>
 {% include "events/event_list.html" %}
+{% if can_create_event %}
 <br />
 <form action="{% url 'create-event' team.id %}" method="get">
-<input type="submit" value="Plan a Get Together!" />
+<button type="submit" class="btn btn-primary">Plan a Get Together</button>
 </form>
+{% endif %}
 {% endblock %}
 
diff --git a/get_together/templates/get_together/teams.html b/get_together/templates/get_together/teams.html
new file mode 100644
index 0000000..fbc8da1
--- /dev/null
+++ b/get_together/templates/get_together/teams.html
@@ -0,0 +1,13 @@
+{% extends "get_together/base.html" %}
+
+{% block content %}
+{% include "events/team_list.html" %}
+
+{% if request.user.is_authenticated %}
+<br/>
+<form action="{% url 'create-team' %}" method="get">
+	<button type="submit" class="btn btn-primary">Start a Team</button>
+</form>
+{% endif %}
+{% endblock %}
+
diff --git a/get_together/urls.py b/get_together/urls.py
index 7c425a6..8fb8e42 100644
--- a/get_together/urls.py
+++ b/get_together/urls.py
@@ -25,6 +25,7 @@ urlpatterns = [
 
     path('events/', views.events_list, name='events'),
     path('create-team/', views.create_team, name='create-team'),
+    path('teams/', views.teams_list, name='teams'),
     path('team/<int:team_id>/', views.show_team, name='show-team'),
     path('team/<int:team_id>/create-event/', views.create_event, name='create-event'),
     path('events/<int:event_id>/<str:event_slug>/', views.show_event, name='show-event'),
diff --git a/get_together/views.py b/get_together/views.py
index 72e7e59..13bd596 100644
--- a/get_together/views.py
+++ b/get_together/views.py
@@ -22,7 +22,7 @@ def home(request, *args, **kwards):
         return render(request, 'get_together/index.html')
 
 def events_list(request, *args, **kwargs):
-    events = Event.objects.all()
+    events = Event.objects.order_by('start_time').all()
     context = {
         'events_list': events,
     }
@@ -51,12 +51,21 @@ def create_team(request, *args, **kwargs):
     else:
      return redirect('home')
 
+def teams_list(request, *args, **kwargs):
+    teams = Team.objects.all()
+    context = {
+        'teams_list': teams,
+    }
+    return render(request, 'get_together/teams.html', context)
+
+
 def show_team(request, team_id, *args, **kwargs):
     team = Team.objects.get(id=team_id)
     team_events = Event.objects.filter(team=team)
     context = {
         'team': team,
         'events_list': team_events,
+        'can_create_event': request.user.profile.can_create_event(team),
     }
     return render(request, 'get_together/show_team.html', context)