Homeworks - Layout
Merge branch 'changes'