Simplify extension matching

Comma-separated values don't work with a space!
Misc content, styling