Further refactoring of views