Fixed rendering & render improvements