diff --git a/src/router.js b/src/router.js
index d8624a4..1ca0040 100644
--- a/src/router.js
+++ b/src/router.js
@@ -139,9 +139,22 @@ export default new VueRouter({
     },
     {
       path: "/org/:orgname",
-      name: "org",
       component: Org,
       props: (route) => ({ orgname: route.params.orgname }),
+      children: [
+        {
+          path: "",
+          name: "org",
+          component: projects,
+          props: (route) => ({ ownertype: "org", ownername: route.params.orgname })
+        },
+        {
+          path: "projects",
+          name: "org projects",
+          component: projects,
+          props: (route) => ({ ownertype: "org", ownername: route.params.orgname })
+        },
+      ]
     },
 
     {
diff --git a/src/views/Org.vue b/src/views/Org.vue
index bf3316b..aae1040 100644
--- a/src/views/Org.vue
+++ b/src/views/Org.vue
@@ -1,32 +1,36 @@
 <template>
   <div>
     <div class="org-title">
-      <span class="org-name">{{orgname}}</span>
+      <router-link class="org-name" :to="ownerLink('org', orgname)">
+        <span>{{orgname}}</span>
+      </router-link>
     </div>
     <div class="tabs">
       <ul>
-        <li :class="[{ 'is-active': currentTab === 'projects' }]">
-          <a @click="currentTab = 'projects'">Projects</a>
+        <li :class="[{ 'is-active': $route.name === 'org projects' || $route.name === 'org' }]">
+          <router-link :to="ownerProjectsLink('org', orgname)">Projects</router-link>
         </li>
       </ul>
     </div>
-    <projects v-if="currentTab == 'projects'" ownertype="org" :ownername="orgname"/>
+    <router-view></router-view>
   </div>
 </template>
 
 
 <script>
+import { ownerLink, ownerProjectsLink } from "@/util/link.js";
+
 import projects from "@/components/projects.vue";
 
 export default {
   name: "Org",
   components: { projects },
   props: {
-    orgname: String,
-    currentTab: {
-      type: String,
-      default: "projects"
-    }
+    orgname: String
+  },
+  methods: {
+    ownerLink: ownerLink,
+    ownerProjectsLink: ownerProjectsLink
   }
 };
 </script>
@@ -40,6 +44,7 @@ export default {
   padding-left: 5px;
   margin-bottom: 25px;
   .org-name {
+    color: $grey-dark;
     padding-left: 5px;
     font-size: 1.5rem;
     padding-right: 1rem;