Issue: 103
Grid/Thumbnail layout
Merge branch 'current-sprint' into ISSUE-100-dm-for-conditions