Refactor views
Create client side