[TASK] altered menu code because of problem with 6.0
[TASK] adjusted code formatting and fixed some stupid typos in the source