Merge "Improve styles & align components to CSS/Less guidelines"