Bit more layout

Needs to stop wasting time on it.