[no-task]: small design changes