Some menu updates
Fixed some button definitions
Fixed the other builds(maybe)