Styling tweaks in wake of merge conflict