fixed more ux
fixed merge