Refactored the app to use decorator pattern on the views