Fixed menu crash and other stuff