General changes in the view

Little changes