Minor corrections to config and layout files.