Changes from testing and enhancements to the Views