Refactored module into a real view