Grid and list enhancements