added layouts and includes