Reorganized all the code, menu works.