WIP style tweaks