Merging the CLI change on layout + new controllers

Merging the CLI change on layout + new controllers