Some fixes, Menu works again yay.