Undo layout changes

Signed-off-by: Tanya Gray <tanyagray.nz@gmail.com>