Optimize view

- reduce save-excursion as possible