improved the view management