added includes files, updated config and layouts