Fix up build and styles