Added some group rendering