Merge Michael (partial: Yolanda-only. CSS kept template-specific)