Swc-1670: rearrange dashboard