views draft partial
merge branch