diff --git a/rowers/views.py b/rowers/views.py
index bc42b34d..41277afc 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -13668,6 +13668,8 @@ def virtualevent_create_view(request):
             # create Site Announcement & Tweet
             if settings.DEBUG:
                 dotweet = False
+            elif 'dev' in settings.SITE_URL:
+                dotweet = False
             else:
                 dotweet = True
             sa = SiteAnnouncement(
diff --git a/templates/basebase.html b/templates/basebase.html
index d56bd658..855c26fe 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -227,11 +227,11 @@
 	  {% endif %}
 	</div>
         <div class="grid_1 tooltip">
-          {% block teams %}
+          {% block challenges %}
           {% endblock %}
         </div>
         <div class="grid_1 tooltip">
-          {% block challenges %}
+          {% block teams %}
           {% endblock %}
         </div>
       </div>