styling and fixed the scaffold overrides