Dino catalog-msabdeljalil V2

Version 2, after Joe Mastey review
Avoid using {...} for multi-line blocks.<br>Trailing whitespace detected.