Refactoring views, add selectable extension