diff --git a/solara/website/pages/careers/__init__.py b/solara/website/pages/careers/__init__.py
index 37fdb60b6..3d69694c2 100644
--- a/solara/website/pages/careers/__init__.py
+++ b/solara/website/pages/careers/__init__.py
@@ -8,36 +8,19 @@ def Page():
             """
             # Careers
             We are always looking for talented individuals to join our team. If you're still be interested after reading the rest of this page, reach out at [contact@widgetti.io](mailto:contact@widgetti.io).
-            """
-        )
-        with solara.Row(style={"flex-wrap": "wrap", "align-items": "stretch"}, gap="0"):
-            with Tile():
-                solara.Markdown(
-                    """
-                    ## Who Are We?
-                    We are a small team of developers working in the gap between Jupyter notebooks and web applications. We are passionate about making data science more accessible and app development painless.
-                    We are based in Groningen, The Netherlands, but work remote first.
-                    """
-                )
-            with Tile(background_color="var(--dark-color-primary-lightest)"):
-                solara.Markdown(
-                    """
-                    ## What Do We Offer?
-                    We offer a flexible work environment, competitive salary, and the opportunity to do meaningful, crossdisciplinary work with scientists and companies worldwide.
-                    We are a small team, so you will have a lot of freedom in your work, and the chance to get your hands dirty with many projects.
-                    """
-                )
-            with Tile(background_color="rgb(255, 233, 31)"):
-                solara.Markdown(
-                    """
-                    ## Who Are We Looking For?
-                    We are looking for developers, technical writers, designers, and everything in between.
-                    """,
-                    style={"--dark-color-text": "black", "--color-text": "black", "color": "black"},
-                )
 
+            ## Who Are We?
+            We are a small team of developers working in the gap between Jupyter notebooks and web applications. We are passionate about making data science more accessible and app development painless.
+            We are based in Groningen, The Netherlands, but work remote first.
 
-@solara.component
-def Tile(children=[], background_color="var(--dark-color-primary)", color="white"):
-    with solara.Div(children=children, style={"flex": "1 1 0", "min-width": "250px", "padding": "30px", "background-color": background_color, "color": color}):
-        pass
+            ## What Do We Offer?
+            We offer a flexible work environment, competitive salary, and the opportunity to do meaningful, crossdisciplinary work with scientists and companies worldwide.
+            We are a small team, so you will have a lot of freedom in your work, and the chance to get your hands dirty with many projects.
+
+            ### Open Source
+            We are strong believers in open source software. When working with us, you can expect the majority of the software you write to be open source, with contributions to Solara as well as other open source projects.
+
+            ## Who Are We Looking For?
+            We are looking for developers, technical writers, designers, and everything in between.
+            """
+        )
diff --git a/solara/website/pages/contact/__init__.py b/solara/website/pages/contact/__init__.py
index cad48a37c..0c7a584cf 100644
--- a/solara/website/pages/contact/__init__.py
+++ b/solara/website/pages/contact/__init__.py
@@ -15,7 +15,7 @@ def Page():
 Solara is developed mostly by Maarten Breddels and Mario Buikhuizen, Founders
 of [Widgetti](https://widgetti.io/).
 
-For business inquiries, please reach out using the form below, or send an email to contact@solara.dev](mailto:contact@solara.dev) regarding Solara, or [info@widgetti.io](mailto:info@widgetti.io) regarding more general Jupyter related matters.
+For business inquiries, please reach out using the form below, or send an email to [contact@solara.dev](mailto:contact@solara.dev) regarding Solara, or [info@widgetti.io](mailto:info@widgetti.io) regarding more general Jupyter related matters.
 """)
     Contact(
         title="Contact Us", subtitle="Please fill out the form below and we will get back to you as soon as possible.", email_subject="Contact Form Submission"
diff --git a/solara/website/pages/home.vue b/solara/website/pages/home.vue
index c5d6b1579..24f0166b6 100644
--- a/solara/website/pages/home.vue
+++ b/solara/website/pages/home.vue
@@ -1,19 +1,19 @@
 <template>
     <main>
         <section id="hero">
-        <nav class="hero-nav"
-            style="position: absolute; top: 0; width: 100%; height: 3.5rem; font-size: 1.25rem; font-weight: 300; display: flex; flex-direction: row; justify-content: flex-end; align-items: center; padding: 0 40px; gap: 40px; box-sizing: border-box;">
-            <a href="/documentation" style="color: var(--color-text)">
-                Documentation
-            </a>
-            <a href="/showcase" style="color: var(--color-text)">
-                Showcase
-            </a>
-        </nav>
+            <nav class="hero-nav"
+                style="position: absolute; top: 0; width: 100%; height: 3.5rem; font-size: 1.25rem; display: flex; flex-direction: row; justify-content: flex-end; align-items: center; padding: 0 30px; gap: 30px; box-sizing: border-box;">
+                <a href="/documentation">
+                    Documentation
+                </a>
+                <a href="/showcase">
+                    Showcase
+                </a>
+            </nav>
             <div class="hero-stars"></div>
             <div class="hero-planet-element"></div>
             <div class="in-hero-banner">
-                Solarathon 2024 • October 13-15 • Last chance to register
+                Catch Us At PyData Paris, September 25-26, 2024
             </div>
             <h1>Build high-quality web applications in pure Python</h1>
             <h2>
@@ -33,12 +33,13 @@
                     <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/domino.png" alt="Domino Data Lab"
                         width="80%" />
                 </a>
-                <a href="https://plotly.com/" target="_blank">
-                    <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/plotly.png" alt="Plotly"
-                        width="80%" />
+                <a href="https://www.stsci.edu/home" target="_blank">
+                    <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/stsci.png"
+                        alt="Space Telescope Science Institute" width="50%" />
                 </a>
-                <a href="https://merck.com/" target="_blank">
-                    <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/merck.svg" alt="Merck" width="80%" />
+                <a href="https://www.gluesolutions.io/home" target="_blank">
+                    <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/glue-solutions-white.png"
+                        alt="Glue Solutions, Inc." width="50%" />
                 </a>
                 <a href="https://planeto-energy.ch/" target="_blank">
                     <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/planeto.png" alt="Planeto Energy"
@@ -207,8 +208,8 @@
             </a>
             <div class="testimonials">
                 <div class="testimonial card-flat">
-                    <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/plotly.png" alt="Plotly"
-                        height="60px" />
+                    <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/logos/flojoy.svg" alt="Flojoy"
+                        style="filter: grayscale(1) contrast(0.4)" height="60px" />
                     <p>
                         Solara is like streamlit, but for Jupyter. I am really excited to see where this goes!
                     </p>
@@ -216,7 +217,7 @@
                         <img src="https://dxhl76zpt6fap.cloudfront.net/public/avatar/jack-parmer.jpg" alt="Jack Parmer" />
                         <div style="flex-grow: 1; display: flex; flex-direction: column; justify-content: center;">
                             <h4>Jack Parmer</h4>
-                            <p>Former CEO and Co-Founder, Plotly</p>
+                            <p>Former CEO of Plotly, CEO of Flojoy</p>
                         </div>
                     </div>
                 </div>
@@ -304,12 +305,12 @@
                 <div class="deploy-card-top-text">
                     <h2>Get Started in Seconds</h2>
                     <p>
-                        To deploy a new Project, installed Solara as a normal Python package or get started with the server
+                        To deploy a new Project, install Solara as a normal Python package or get started with the server
                         from
                         the command line.
                     </p>
-                    <a href="/documentation">
-                        Get started &gt;
+                    <a href="/documentation/getting_started">
+                        Install Now &gt;
                     </a>
                 </div>
                 <img src="https://dxhl76zpt6fap.cloudfront.net/new-homepage/backgrounds/what-ship.svg"
@@ -440,14 +441,7 @@
                 </div>
             </div>
             <div class="footer-flex homepage-row">
-                <div>
-                    <a>
-                        Privacy Policy
-                    </a>
-                    <a>
-                        Terms and Conditions
-                    </a>
-                </div>
+                <div></div>
                 <small>
                     © 2024 Widgetti BV. All rights reserved.
                 </small>
diff --git a/solara/website/pages/our_team/__init__.py b/solara/website/pages/our_team/__init__.py
index fe520c93b..487284d6a 100644
--- a/solara/website/pages/our_team/__init__.py
+++ b/solara/website/pages/our_team/__init__.py
@@ -33,9 +33,9 @@ def Page():
         )
         DevCard(
             "Iisakki Rotko",
-            "Junior Software Engineer",
+            "Medior Software Engineer",
             "https://github.com/iisakkirotko",
-            "Iisakki is a junior software engineer at Widgetti, working primarily on Solara. He has a background in physics and web development.",
+            "Iisakki is a medior software engineer at Widgetti, working primarily on Solara. He has a background in physics and web development.",
             image="https://dxhl76zpt6fap.cloudfront.net/public/avatar/iisakki-rotko.jpg",
             linkedin="https://www.linkedin.com/in/iisakkirotko/",
             email="iisakki.rotko@widgetti.io",
diff --git a/solara/website/pages/pricing/__init__.py b/solara/website/pages/pricing/__init__.py
index 921c22d6a..a2a3b9265 100644
--- a/solara/website/pages/pricing/__init__.py
+++ b/solara/website/pages/pricing/__init__.py
@@ -18,6 +18,8 @@ def Page():
 - Access to all `solara-enterprise` components and functionality
 - Priority support from the Solara team, including bug fixes and questions
 - Potential for custom components and functionality as agreed separately
+- Trainings and workshops for your team
+- Regular code reviews and/or design consultation
 
 All enterprise licenses are custom and are priced based on the needs of the organization. Please contact us below for more information.
         """)
diff --git a/solara/website/pages/roadmap/roadmap.md b/solara/website/pages/roadmap/roadmap.md
index 02091806f..f17629297 100644
--- a/solara/website/pages/roadmap/roadmap.md
+++ b/solara/website/pages/roadmap/roadmap.md
@@ -1,35 +1,35 @@
 # Roadmap for Solara
 
-## Short Term
+This roadmap is a living document that outlines the future direction of Solara. It is informed by community feedback, shaped by our vision for the project, and influenced by real-world problems we've solved for customers. If you're interested in getting involved or becoming a design partner, [contact us here](https://solara.dev/contact).
 
-### Solara 2.0
 
-Exciting news! Solara 2.0 should release sometime in the coming months. For the 2.0 release, we want to focus on a few things:
+## Solara 2.0
 
-- Improvements to the conversion of Solara components to HTML elements. The number of wrapping elements that are generated by Solara should be drastically reduced. We also want to remove non-displayed elements that are inserted for components such as `solara.Meta`.
+Exciting news! We aim to release Solara 2.0 by the end of the year. For the 2.0 release, we want to focus on a few things:
 
-- Solara's `Computed` properties should be free of invalid states. This improvement should follow from us more closely implementing the ideas of [Javascript Signals](https://github.com/tc39/proposal-signals) and the pull based data update model.
+- Improvements to reactive state management, closely following the principles of [Javascript Signals](https://github.com/tc39/proposal-signals) and its hybrid push-pull model. This will include glitch-free computed values and (side) effects triggered by signals.
 
-- Improvements to some customization APIs, such as `solara.AppBar`.
+- Elimination of common mistakes, such as detecting state mutations and avoiding misuse of hooks (e.g., using hooks in loops).
 
-- And more
+- [See more details in the 2.0 milestone on GitHub.](https://github.com/widgetti/solara/milestone/1)
 
 ## Medium Term
 
 ### Blog
 
-In the medium term we hope to update the solara.dev website with a blog section where we can discuss the design decisions and philosophy behind Solara.
+In the medium term, we plan to add a blog section to the solara.dev website, where we'll discuss design decisions and the philosophy behind Solara.
 
 ### Documentation
 
-We hope to implement various improvements to the documentation. This should include the streamlining of the beginners tutorials, as well as providing documentation for some of the features that are used internally in Solara already, but that are not yet present in the documentation.
+We plan to improve the documentation by streamlining beginner tutorials and adding coverage for internal features that are currently undocumented.
 
 ### Third-Party Solara Components
 
-Although it is already possible to make custom components for solara, there isn't an established way to distribute them. We hope to support the development efforts of the community by providing a platform for sharing custom components easily.
+While it is already possible to make custom components for Solara, there isn't an established way to distribute them. We hope to support the development efforts of the community by providing a platform for sharing custom components easily.
+
 
 ## Long Term
 
 ### Different Looks
 
-Our objective is to provide users with a robust, yet flexible front-end framework they can access directly from Python. To provide flexibility we hope to make available different front-end frameworks for users to choose from - should the user want to, `solara-ui` could be replaced completely with some other Solara compatible front-end implementation. As some users may already know, Solara is built on top of `ipyvuetify`, which provides a Python interface to the Vuetify javascript framework. However, users shouldn't be locked to that choice. We hope to one day provide similar interfaces for other front-end frameworks to fully benefit from the rich javascript ecosystem. Some efforts have already been taken towards this goal - `ipyreact` provides a touch surface to React, while we have also tried our hand at implementing [Ant Design](https://ant.design) for Solara via [ipyantd](https://github.com/widgetti/ipyantd)
+Our objective is to provide users with a robust, yet flexible front-end framework they can access directly from Python. To provide flexibility we hope to make available different front-end frameworks for users to choose from - should the user want to, `solara-ui` could be replaced completely with some other Solara compatible front-end implementation. As some users may already know, Solara is built on top of `ipyvuetify`, which provides a Python interface to the Vuetify javascript framework. However, users shouldn't be locked to that choice. We hope to one day provide similar interfaces for other front-end frameworks to fully benefit from the rich javascript ecosystem. Some efforts have already been taken towards this goal - `ipyreact` provides an easy way to integrate with React from Python, making it possible to making bindings to [Ant Design](https://ant.design) for Solara via [ipyantd](https://github.com/widgetti/ipyantd)