Fix top-level-Picture & model list picture
A bit of overhead
2.2.7
Fix boolean. close #62