fixed names and references
go get layout