Refactored view structure