fix(Layout): Fixes post layout
Merge branch 'master' into develop