Some adjustments in the View control code