Fixes flash layout
Merge branch 'milestone/2/the-courrier'