Clean-up + streamline markup and styling for step 1