SWC-117 Fixed issues with tablet and mobile layouts