Complete layout, complete links and tidy up tests