Latest styling tweaks merged in