Wip/fix new layout #15

Closed julioreisdev closed 6 months ago