Some improvements at views.