fixed up views wrt new api
merged michas recent work