More work on the layout re-build

The work continues on the layout re-build, which means that some of the other topics have been put on the "back burner" for a short while, but will continue again soon!