Some fixes and change rendering method.