Updated the server side rendering to work properly