Fix remaining issues and include layout file.