continue the refactor of views