Square styling fixes
Square styling fixes