Some adjustments on views