tidy up layouts, remove unecessary bits (for this testing)