Improve steps, layout and formatting.