Some changes to view