fixed bugs and views