refactoring layout
make preparationstep work