Update and fix some styles