Improved renderer

This will help improve the shared viewing in tab "Share" as well (when
I move it there)