[OWD-26846] Unblocked & re-styled