Some small changes

Small changes in most views