Tidy up of layouts

Found https://github.com/motion-kit/motion-kit/issues/46 - decided to
refactor.