Site layout and chartmaker updates