layout update
Merge
Merge branch 'master' of https://github.com/PierrickPuimeanChieze/New-Dawn.git