clean up
fix rendering serverside