case-3593 - Styling issues fixes
Merge branch 'case-3593' into development