updated rendering - added css handling