#5 layout update (WIP)