updated views, nearly all are there.