Updated some views to meet requirements