Updated layout structure

* Added layout path in the relevant controllers
* Passed view content to the layout instead of running the make command directly
* Removed unwanted views