Annoying menu fixes