Fill in layout
Merge branch 'feature/Filling_in_layout'