Fix layout overlaping problem with imagesLoaded
Merge branch 'master' into staging