Refactor static pages and cleanup views