Some cleanups
MenuPanel fix
Merge branch 'lukas' into develop