minor fixes and views update