Reworked/renamed/enhanced 'in context' elements