changes to the includes and layout files