Resolve some more import issues in layers.models
Merge branch 'thumbnail_fix' into noaa_dev