fixing bugs after UI merge