impr(style): work on layout

Related to CAM-2915