[all][s]: improve look and layout (a bit).