ui fix. for beta