Close #32, make block view more efficient