Some changes in view