Rework some styles