add cluster rendering; better layout