adjust styling on s1,2 and add unscoped