minor redistribution. added UI new components