Fixing for server rendering issues. Still problems on the client side to clean up.