Some small changes in the view