New styling mostly complete