Improve support for rendering inside browser app