edit ui more fixes