views using correct blocks, did some reformatting
added entities