changed some views to use units where necessary