Views refactors