Style tweaks and fix legend updating.