Update style, fix null object