Fix step field layout issues.