Refactored organization of views