Improved view to eliminate some workarounds.