* Investigate whether it is reasonably simple to move to a different layout and if so, remove the dependency