merging Petya Stavrova module and layout