View Refactoring & Removals

Refactored views, removed temporary click and migrate set ups