Modified views to use base