added some stuff into layout