Refactor Views

Refactor views