some improvement... server side rendering still lacking