Some polishing in the views