Remove target for Empty Step issues.
Reformat layout.