Latest changes - view enhancements