fixing some more ui bugs