Added layouts/partial layouts and XXS