Improve the render and bugfix