Modified views to handle role