Add new files to main
Fixed bug where layout could not be found
Added more variables to scope