Added components and layouts