Refactor: duplication
Fannying around with layout