separated layout-specific stuff into separate .h and .c files which are included...