Refactored the view
merged