SWC-1977: fixing layout
Merge pull request #1369 from jay-hodgson/SWC-1977

SWC-1977: fixing layout