Style tweaks and zero state