Fixed ui menu bugs