Views refactor
view management introduced
some minor fixes