[master] Tidyup views.