Added missing functionality for scaffolding

Also added missing console output on makeLayout functions.