Refactor views for navigation