Tweak navigation template, and fix a bad condition
Implement thumbnails