Add layouts and includes