Fix image alignment
Merge branch 'image_fix' into develop
Fix broken scss