Adding first dynamic content in views
Refactoring views to adhere more to DRY