Fix typo and remove setting layout on base module controller
Rename