Fixed build
Moved layouts