Refactored and created new views for double support