Improved view handler