new views + fixes