Style updates and tweaks