Messed up Menu in last commit -> fixed
Reorganized DisplayList