Some adjustments on Controller Template