Restyle, change with to 5px and add rounded border
Merge