For BAS-443 reorganizing layout