Reworked styling