Fixes and menu working hurray !