refactoring views
refactoring + misc.