Fix tablet menu bugs