fix layout and files for all steps