Added layouts and includes