diff --git a/source/docs/team.md b/source/docs/team.md
index 205804e..1469fb3 100644
--- a/source/docs/team.md
+++ b/source/docs/team.md
@@ -17,11 +17,6 @@ With a keen interest and background in peer-to-peer applications and compilers,
 
 Mamy joined Status as a Nim developer in the research team. After a career in leading American and French banks and non-profits, he decided that tech, blockchain and AI will eat the world. On the side, instead of mining he is teaching deep learning tricks to his GPU.
 
-### [Ryan Lipscombe](https://github.com/coffeepots)
-
-Fascinated by the transformative potential of blockchain and distributed systems, Ryan joined Status research as a Nim developer. His career spans from data science to embedded systems and has been part of the Nim community since 2015, working on database components and virtual machines for evolutionary systems.
-
-
 ### [Yuriy Glukhov](https://github.com/yglukhov)
 
 Yuriy has deep passion for new technologies and keen interest in many areas of IT. He was one of the first CTOs to successfully use Nim in a commercial project.
@@ -39,6 +34,14 @@ Dustin is the team's Pure Quickwitted Indianglassfish.
 
 Bruno is the technical writer and team's DX guy. He's been in blockchain for 3 years after 15 years of web. His passion for decentralization and forwarding the world's truly censorship-free internet is what drove him to Nimbus. What little free time he has, he tries to spend on sports, board games and VR. You can add him on Oculus and Steam as theswader.
 
+### [Peter Munch](https://github.com/PMunch)
+
+Peter has been working with Nim since discovering it during his studies back in 2016. Since a young age he's been interested in programming. Starting out with games, but touching in on everything from web to high-performance and distributed computing through his work and studies.
+
+### [Ștefan Talpalaru](https://github.com/stefantalpalaru)
+
+Ștefan comes from a decade of professional web development and a decade and a half of amateur free software contributions in a wide range of domains and programming languages. His claim to fame in the Nim world is the grafting of a Go runtime to the Nim compiler by way of the pluggable garbage collector API.
+
 # ETYMOLOGY
 
 Nimbus is a reference to:
diff --git a/themes/navy/layout/index.swig b/themes/navy/layout/index.swig
index c3c3897..590d856 100644
--- a/themes/navy/layout/index.swig
+++ b/themes/navy/layout/index.swig
@@ -14,7 +14,7 @@
         <h2 id="top-header">Research for Scale️️</h2>
         <p>Nimbus is a research project and a client implementation for Ethereum 2.0 designed to perform well on embedded systems and personal mobile devices, including older smartphones with resource-restricted hardware.
         </p>
-        <a href="https://github.com/status-im/nimbus">See our repos <img src="../img/arrow_orange.svg" /></a>
+        <a href="https://github.com/status-im?utf8=%E2%9C%93&q=nim&type=&language=">See our repos <img src="../img/arrow_orange.svg" /></a>
 
         <div class="work-items">
             <div class="work-item">
@@ -65,8 +65,8 @@
                 <h3>Join the Team</h3>
                 <p>We are always looking for passionate and talented individuals to join our team.
                 <p>
-                    <a href="https://status.im/open-positions.html">See list of open roles</a>
-                    <span><a href="https://status.im/open-positions.html"><img src="../img/arrow_ogn.png" /></a></span>
+                    <a href="https://status.im/contribute/open_positions.html">See list of open roles</a>
+                    <span><a href="https://status.im/contribute/open_positions.html"><img src="../img/arrow_ogn.png" /></a></span>
             </div>
             <div class="contribute">
                 <h3>Work on Bounties</h3>