Some changes to Views