Visual fixes
Merge branch 'feature-visuals' into develop