SWC-1977: fixing layout